Changeset 523
- Timestamp:
- 04/25/09 09:15:58 (3 years ago)
- Files:
-
- trunk/src/client.cpp (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/client.cpp
r485 r523 146 146 // The directory must exist, otherwise we can't do anything 147 147 // If it doesn't exist, display an explicit message in the log part of the window 148 if(!multiProtocolFile::DirExists(mLocation ))148 if(!multiProtocolFile::DirExists(mLocation.c_str())) 149 149 { 150 150 mLog = wxString::Format(_("Directory %s does not exist or cannot be read!"), mLocation.c_str()); … … 154 154 } 155 155 156 if (multiProtocolFile::FileExists( mLocation + _T("FAHlog.txt")))157 { 158 mLastModification = multiProtocolFile::LastModification( mLocation + _T("FAHlog.txt"));156 if (multiProtocolFile::FileExists(wxString::Format(wxT("%sFAHlog.txt"),mLocation.c_str()))) 157 { 158 mLastModification = multiProtocolFile::LastModification(wxString::Format(wxT("%sFAHlog.txt"),mLocation.c_str())); 159 159 } 160 160 else … … 169 169 170 170 // Try to load the log file of the client 171 if(!LoadLogFile( mLocation + _T("FAHlog.txt")))171 if(!LoadLogFile(wxString::Format(wxT("%sFAHlog.txt"),mLocation.c_str()))) 172 172 { 173 173 mLog = wxString::Format(_("Error while reading %sFAHlog.txt!"), mLocation.c_str()); … … 177 177 } 178 178 179 if(!LoadQueueFile( mLocation + _T("queue.dat")))179 if(!LoadQueueFile(wxString::Format(wxT("%squeue.dat"),mLocation.c_str()))) 180 180 { 181 181 _LogMsgError(wxString::Format(_("Error while reading %squeue.dat"), mLocation.c_str())); … … 194 194 195 195 // Try to load the 'unitinfo.txt' file generated by the client 196 if(!LoadUnitInfoFile( mLocation + _T("unitinfo.txt")))196 if(!LoadUnitInfoFile(wxString::Format(wxT("%sunitinfo.txt"),mLocation.c_str()))) 197 197 { 198 198 _LogMsgError(wxString::Format(_("Error while reading %sunitinfo.txt!"), mLocation.c_str())); … … 301 301 { 302 302 clientLocation = BenchmarksManager::GetInstance()->GetClientLocationFromClientId(benchmarks[i]->GetClientId()); 303 clientName = ClientsManager::GetInstance()->GetNameFromLocation(clientLocation );303 clientName = ClientsManager::GetInstance()->GetNameFromLocation(clientLocation.c_str()); 304 304 if (clientName == mName) 305 305 {
