Fixed #596

src/app/pausemanager.cpp

@@ -69,11 +69,16 @@ bool CPauseManager::IsPause()
     return m_activePause.size() > 0;
 }
 
+PauseType CPauseManager::GetPauseType()
+{
+    if (m_activePause.size() > 0)
+        return m_activePause[m_activePause.size()-1]->type;
+    return PAUSE_NONE;
+}
+
 void CPauseManager::UpdatePause()
 {
-    PauseType type = PAUSE_NONE;
-    if (m_activePause.size() > 0)
-        type = m_activePause[m_activePause.size()-1]->type;
+    PauseType type = GetPauseType();
 
     if (type != PAUSE_NONE)
     {

src/app/pausemanager.h

@@ -71,6 +71,7 @@ public:
     void FlushPause();
 
     bool IsPause();
+    PauseType GetPauseType();
 
 private:
     void UpdatePause();

src/ui/mainshort.cpp

@@ -21,6 +21,7 @@
 #include "ui/mainshort.h"
 
 #include "app/app.h"
+#include "app/pausemanager.h"
 
 #include "common/logger.h"
 
@@ -107,13 +108,15 @@ bool CMainShort::CreateShortcuts()
           m_engine->GetPause()) )  // hangs during edition?
     {
         m_interface->CreateShortcut(pos, dim, 128+6, EVENT_OBJECT_EDITLOCK);
-        if (!m_engine->GetPause())
-            return true;
     }
     if (m_main->GetFreePhoto() && m_main->GetSelect() == nullptr)
     {
         return true;
     }
+    CPauseManager* pause = CPauseManager::GetInstancePointer();
+
+    if (pause->GetPauseType() == PAUSE_SATCOM || pause->GetPauseType() == PAUSE_EDITOR || pause->GetPauseType() == PAUSE_DIALOG)
+        return true;
 
     // Create new shortcuts