[colobot] 24/145: Deactive pause before jumping to next visit

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 8ccad5b954e9a11a0ccf4ffad8e12aa7023706c3
Author: Krzysztof Dermont <erihel at gmail.com>
Date:   Tue Mar 29 22:29:24 2016 +0200

    Deactive pause before jumping to next visit
    
    When pause was active setting new pause resulted in strange behavior.
    
    This should fix issue #736.
---
 src/level/robotmain.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp
index c410e31..9506fca 100644
--- a/src/level/robotmain.cpp
+++ b/src/level/robotmain.cpp
@@ -1631,6 +1631,12 @@ void CRobotMain::StartDisplayVisit(EventType event)
 {
     if (m_editLock) return;
 
+    if (m_visitPause)
+    {
+        m_pause->DeactivatePause(m_visitPause);
+        m_visitPause = nullptr;
+    }
+
     Ui::CWindow* pw = static_cast<Ui::CWindow*>(m_interface->SearchControl(EVENT_WINDOW2));
     if (pw == nullptr) return;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git