From f324d4b27dce358b7824c445b2f2f3ac14f20dd2 Mon Sep 17 00:00:00 2001 From: LPFaint99 Date: Sun, 12 Jul 2009 07:17:43 +0000 Subject: [PATCH] correct reading the working directory string git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3761 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/Main.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index 45fbdf8369..e86a21169d 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -164,15 +164,19 @@ bool DolphinApp::OnInit() } else { - char tmpChar[256]; - fread(tmpChar, 1, 255, workingDir); + char *tmpChar; + long len; + fseek(workingDir,0,SEEK_END); + len=ftell(workingDir); + fseek(workingDir,0,SEEK_SET); + tmpChar = new char[len]; + fread(tmpChar, len, 1, workingDir); fclose(workingDir); - wxSetWorkingDirectory(wxString::FromAscii(tmpChar)); - //PanicAlert("%s\n%s",tmpChar, (const char*)wxGetCwd().mb_str(/*wxConvUTF8*/)); - if (strcmp(tmpChar, wxGetCwd().mb_str()) != 0) + if (!wxSetWorkingDirectory(wxString::FromAscii(tmpChar))) { PanicAlert("set working directory failed"); } + delete [] tmpChar; } } #endif