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

Fixed lockups when calling StartSuspend multiple times

master
krzys-h 2016-07-04 17:02:39 +02:00
parent fb3245977c
commit 6f412df232
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/level/robotmain.cpp
View File

@ -1554,11 +1554,13 @@ char* CRobotMain::GetDisplayInfoName(int index)
//! Beginning of a dialogue during the game //! Beginning of a dialogue during the game
void CRobotMain::StartSuspend() void CRobotMain::StartSuspend()
{ {
if (m_suspend != nullptr) return; // already suspended
if (!IsPhaseWithWorld(m_phase)) return; if (!IsPhaseWithWorld(m_phase)) return;
GetLogger()->Info("Start suspend\n");
m_sound->MuteAll(true); m_sound->MuteAll(true);
ClearInterface(); ClearInterface();
m_suspend = m_pause->ActivatePause(PAUSE_ENGINE|PAUSE_HIDE_SHORTCUTS|PAUSE_MUTE_SOUND|PAUSE_CAMERA); m_suspend = m_pause->ActivatePause(PAUSE_ENGINE | PAUSE_HIDE_SHORTCUTS | PAUSE_MUTE_SOUND | PAUSE_CAMERA);
m_engine->SetOverFront(false); // over flat behind m_engine->SetOverFront(false); // over flat behind
CreateShortcuts(); CreateShortcuts();
@ -1572,6 +1574,9 @@ void CRobotMain::StartSuspend()
//! End of dialogue during the game //! End of dialogue during the game
void CRobotMain::StopSuspend() void CRobotMain::StopSuspend()
{ {
if (m_suspend == nullptr) return; // not suspended
GetLogger()->Info("Stop suspend\n");
m_sound->MuteAll(false); m_sound->MuteAll(false);
ClearInterface(); ClearInterface();
m_pause->DeactivatePause(m_suspend); m_pause->DeactivatePause(m_suspend);
@ -1579,7 +1584,7 @@ void CRobotMain::StopSuspend()
m_engine->SetOverFront(true); // over flat front m_engine->SetOverFront(true); // over flat front
CreateShortcuts(); CreateShortcuts();
if(m_infoObject != nullptr) if (m_infoObject != nullptr)
SelectObject(m_infoObject, false); // gives the command buttons SelectObject(m_infoObject, false); // gives the command buttons
m_map->ShowMap(m_mapShow); m_map->ShowMap(m_mapShow);
m_displayText->HideText(false); m_displayText->HideText(false);