From f3094312b2618bf4f0f321be9e243f557c7679a1 Mon Sep 17 00:00:00 2001 From: krzys-h Date: Thu, 28 Jan 2016 20:36:55 +0100 Subject: [PATCH] Fix startup crash with disabled autosave, closes #705 --- src/level/robotmain.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index 53273b5c..93d7234c 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -5597,6 +5597,9 @@ int CRobotMain::GetAutosaveSlots() int CRobotMain::AutosaveRotate(bool freeOne) { + if (m_playerProfile == nullptr) + return 0; + GetLogger()->Debug("Rotate autosaves...\n"); // Find autosave dirs auto saveDirs = CResourceManager::ListDirectories(m_playerProfile->GetSaveDir()); @@ -5606,7 +5609,7 @@ int CRobotMain::AutosaveRotate(bool freeOne) try { const std::string autosavePrefix = "autosave"; - if (dir.substr(0, autosavePrefix.length()) == "autosave") + if (dir.substr(0, autosavePrefix.length()) == autosavePrefix) { int id = boost::lexical_cast(dir.substr(autosavePrefix.length())); autosaveDirs[id] = m_playerProfile->GetSaveFile(dir);