piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

some more fixes for the switch to unicode. Thanks sl1nk3.s

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3925 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
LPFaint99
2009-08-02 05:59:55 +00:00
parent 7b19632b4a
commit 6cbeeafdf1
10 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -132,7 +132,7 @@ bool DolphinApp::OnInit()
if (!noCheckForInstallDir)
{
char tmp[1024];
sprintf(tmp, "%s/.dolphin%swd", (const char*)wxStandardPaths::Get().GetUserConfigDir().mb_str(wxConvUTF8),
sprintf(tmp, "%s/.dolphin%swd", (const char*)wxStandardPaths::Get().GetUserConfigDir().mb_str(),
#ifdef _M_IX86
"x32");
#else
@ -152,7 +152,7 @@ bool DolphinApp::OnInit()
else
{
char CWD[1024];
sprintf(CWD, "%s", (const char*)wxGetCwd().mb_str(wxConvUTF8));
sprintf(CWD, "%s", (const char*)wxGetCwd().mb_str());
if (PanicYesNo("Set install location to:\n %s ?", CWD))
{
FILE* workingDirF = fopen(tmp, "w");
@ -320,7 +320,7 @@ bool DolphinApp::OnInit()
// First check if we have a elf command line. Todo: Should we place this under #if wxUSE_CMDLINE_PARSER?
if (LoadElf && ElfFile != wxEmptyString)
{
BootManager::BootCore(std::string(ElfFile.ToAscii()));
BootManager::BootCore(std::string(ElfFile.mb_str()));
}
/* If we have selected Automatic Start, start the default ISO, or if no default
ISO exists, start the last loaded ISO */