immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reset save filename if exception is thrown while loading

dev-mp
krzys-h 2014-11-10 22:50:00 +01:00
parent 5cd45fbe17
commit afa0061364
1 changed files with 973 additions and 967 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/object/robotmain.cpp
View File

@ -3774,6 +3774,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
m_missionTimerStarted = false; m_missionTimerStarted = false;
m_missionTimer = 0.0f; m_missionTimer = 0.0f;
try {
CLevelParser* level = new CLevelParser(base, rank/100, rank%100); CLevelParser* level = new CLevelParser(base, rank/100, rank%100);
level->Load(); level->Load();
@ -4776,6 +4777,11 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
m_beginSatCom = true; // message already displayed m_beginSatCom = true; // message already displayed
} }
} catch(...) {
m_dialog->SetSceneRead("");
m_dialog->SetStackRead("");
throw;
}
m_dialog->SetSceneRead(""); m_dialog->SetSceneRead("");
m_dialog->SetStackRead(""); m_dialog->SetStackRead("");