diff options
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/maindialog.cpp | 8 | ||||
| -rw-r--r-- | src/ui/studio.cpp | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index 32fa6e8..4b1c8f2 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -4166,8 +4166,10 @@ void CMainDialog::IOUpdateList() return; std::string filename = (m_saveList.at(sel) / "screen.png").make_preferred().string(); + std::string savedir = CResourceManager::GetSaveLocation()+"/"; boost::replace_all(filename, "\\", "/"); - boost::replace_all(filename, GetSavegameDir(), GetPHYSFSSavegameDir()); //TODO: Refactor everything to PHYSFS, see issue #334 + boost::replace_all(savedir, "\\", "/"); + boost::replace_all(filename, savedir, ""); //TODO: Refactor everything to PHYSFS, see issue #334 filename = "../"+filename; if ( m_phase == PHASE_WRITE || m_phase == PHASE_WRITEs ) { @@ -6002,9 +6004,7 @@ bool CMainDialog::GetSceneSoluce() std::string CMainDialog::GetSavegameDir() { - std::string out = CResourceManager::GetSaveLocation()+"/"+m_savegameDir; - boost::replace_all(out, "\\", "/"); - return out; + return CResourceManager::GetSaveLocation()+"/"+m_savegameDir; } //TODO: Use PHYSFS everywhere diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index 93fd050..efdbbbc 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -1546,7 +1546,10 @@ std::string CStudio::SearchDirectory(bool bCreate, bool physfsReady) std::string dir2 = dir; if(physfsReady) { - boost::replace_all(dir2, CResourceManager::GetSaveLocation()+"/", ""); + std::string savedir = CResourceManager::GetSaveLocation()+"/"; + boost::replace_all(dir2, "\\", "/"); + boost::replace_all(savedir, "\\", "/"); + boost::replace_all(dir2, savedir, ""); } return dir2; } |