diff options
| author | krzys-h <krzys_h@interia.pl> | 2013-03-31 10:22:08 +0200 |
|---|---|---|
| committer | krzys-h <krzys_h@interia.pl> | 2013-03-31 10:22:08 +0200 |
| commit | 0625f064a74ab70b06534b2198fa2b10f42fa183 (patch) | |
| tree | 6f710509bcb841bf017775b650e596c81a3684ab /src/object/robotmain.cpp | |
| parent | 90301e24c0fc5fcd6bffb0399e203e5adea6aa2c (diff) | |
| parent | 5a60a7a21958e2d8cfd33148f575d36e3bbd9ebb (diff) | |
| download | colobot-0625f064a74ab70b06534b2198fa2b10f42fa183.tar.gz colobot-0625f064a74ab70b06534b2198fa2b10f42fa183.tar.bz2 colobot-0625f064a74ab70b06534b2198fa2b10f42fa183.zip | |
Merge branch 'dev' of github.com:colobot/colobot into dev
Diffstat (limited to 'src/object/robotmain.cpp')
| -rw-r--r-- | src/object/robotmain.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 3a880a6..1e9e207 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -1333,7 +1333,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 ? { @@ -1475,8 +1475,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)) { |