diff options
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/brain.cpp | 2 | ||||
| -rw-r--r-- | src/object/robotmain.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/object/brain.cpp b/src/object/brain.cpp index fa3e425..951a763 100644 --- a/src/object/brain.cpp +++ b/src/object/brain.cpp @@ -2056,7 +2056,7 @@ void CBrain::UpdateInterface(float rTime) pc->SetState(Ui::STATE_VISIBLE, m_main->GetShowMap()); } - pb = (Ui::CButton*)pw->SearchControl(EVENT_OBJECT_REC); + pb = static_cast<Ui::CButton*>(pw->SearchControl(EVENT_OBJECT_REC)); if ( pb != 0 ) { if ( m_bTraceRecord && Math::Mod(m_time, 0.4f) >= 0.2f ) diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index c1e4140..4cea7ed 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -1332,7 +1332,7 @@ bool CRobotMain::EventProcess(Event &event) // Management of the console. if (m_phase != PHASE_NAME && !m_movie->IsExist() && - !m_movieLock && !m_editLock && + !m_movieLock && !m_editLock && !m_engine->GetPause() && event.type == EVENT_KEY_DOWN && event.key.key == KEY(PAUSE)) // Pause ? { @@ -1474,8 +1474,9 @@ bool CRobotMain::EventProcess(Event &event) ChangePhase(PHASE_WIN); else if (m_lostDelay > 0.0f) ChangePhase(PHASE_LOST); - else + else if (!m_cmdEdit) { m_dialog->StartAbort(); // do you want to leave? + } } if (event.key.key == KEY(PAUSE)) { |