From b7b5f002a636154033166a2c828765386c14e5a5 Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Sat, 30 Mar 2013 16:03:25 +0100
Subject: * Removed warning while compiling brain.cpp * Fix for issue #130 *
 Fix for issue #128 with wrong sound pitch

---
 src/object/robotmain.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/object/robotmain.cpp')

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))
                 {
-- 
cgit v1.2.3-1-g7c22