Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Fix creation of strings for paths to client executable and data directory on Windows

This commit is contained in:
Charlie Fenton 2012-11-20 02:55:13 -08:00 committed by Oliver Bock
parent 4087d5f488
commit bad6571589
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checkin_notes
View File

@ -6278,3 +6278,10 @@ Charlie 28 Oct 2012
DlgGenericMessage.cpp
ProjectInfoPage.cpp
WelcomePage.cpp
Charlie 20 Nov 2012
- Fix creation of strings for paths to client executable and data directory
on Windows.
clientgui/
BOINCClientManager.cpp

6
clientgui/BOINCClientManager.cpp
View File

@ -219,6 +219,7 @@ bool CBOINCClientManager::StartupBOINCCore() {
bool bReturnValue = false;
wxString strExecute = wxEmptyString;
wxString strDataDir = wxEmptyString;
if (IsBOINCCoreRunning()) return true;
@ -235,7 +236,7 @@ bool CBOINCClientManager::StartupBOINCCore() {
// Append boinc.exe to the end of the strExecute string and get ready to rock
strExecute.Printf(
wxT("\"%s\\boinc.exe\" --redirectio --launched_by_manager %s"),
wxT("\"%sboinc.exe\" --redirectio --launched_by_manager %s"),
wxGetApp().GetRootDirectory().c_str(),
wxGetApp().GetArguments().c_str()
);
@ -255,7 +256,8 @@ bool CBOINCClientManager::StartupBOINCCore() {
if (wxGetApp().GetDataDirectory().empty()) {
pszDataDirectory = NULL;
} else {
pszDataDirectory = (const char*)wxGetApp().GetDataDirectory().mb_str();
strDataDir = wxGetApp().GetDataDirectory();
pszDataDirectory = (const char*)strDataDir.mb_str();
}
wxLogTrace(wxT("Function Status"), wxT("CMainDocument::StartupBOINCCore - pszExecute '%s'\n"), pszExecute);