Merge pull request #2744 from myk002/myk_no_inception

Solve the inception problem: prevent screens (e.g. gui/launcher) from hanging when they attempt to dismiss and show themselves simultaneously

docs/changelog.txt

@@ -36,6 +36,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## New Plugins
 
 ## Fixes
+-@ ``Screen``: allow `gui/launcher` and `gui/quickcmd` to launch themselves without hanging the game
 -@ Fix issues with clicks "passing through" some DFHack window elements, like scrollbars
 
 ## Misc Improvements

library/include/modules/Screen.h

@@ -318,9 +318,10 @@ namespace DFHack
 
             static const int RESTORE_AT_TOP = 0x1;
         private:
-            void extract(df::viewscreen*);
+            void extract();
-            void merge(df::viewscreen*);
+            void merge();
             df::viewscreen* screen;
+            df::viewscreen* prev_parent;
             int flags;
         };
     }

library/modules/Screen.cpp

@@ -527,43 +527,49 @@ void Screen::raise(df::viewscreen *screen) {
 namespace DFHack { namespace Screen {
 
 Hide::Hide(df::viewscreen* screen, int flags) :
-    screen{screen}, flags{flags}
+    screen{screen}, prev_parent{nullptr}, flags{flags} {
-{
+    if (!screen)
-    extract(screen);
+        return;
+
+    // don't extract a screen that's not even in the stack
+    if (screen->parent)
+        extract();
 }
 
-Hide::~Hide()
+Hide::~Hide() {
-{
     if (screen)
-        merge(screen);
+        merge();
 }
 
-void Hide::extract(df::viewscreen* a)
+void Hide::extract() {
-{
+    prev_parent = screen->parent;
-    df::viewscreen* ap = a->parent;
+    df::viewscreen *prev_child = screen->child;
-    df::viewscreen* ac = a->child;
 
-    ap->child = ac;
+    screen->parent = nullptr;
-    if (ac) ac->parent = ap;
+    screen->child = nullptr;
-    else Core::getInstance().top_viewscreen = ap;
+
+    prev_parent->child = prev_child;
+    if (prev_child) prev_child->parent = prev_parent;
+    else Core::getInstance().top_viewscreen = prev_parent;
 }
 
-void Hide::merge(df::viewscreen* a)
+void Hide::merge() {
-{
+    if (screen->parent) {
+        // we're somehow back on the stack; do nothing
+        return;
+    }
+
     if (flags & RESTORE_AT_TOP) {
-        a->parent = NULL;
+        Screen::show(std::unique_ptr<df::viewscreen>(screen));
-        a->child = NULL;
-        Screen::show(std::unique_ptr<df::viewscreen>(a));
         return;
     }
 
-    df::viewscreen* ap = a->parent;
+    df::viewscreen* new_child = prev_parent->child;
-    df::viewscreen* ac = a->parent->child;
 
-    ap->child = a;
+    prev_parent->child = screen;
-    a->child = ac;
+    screen->child = new_child;
-    if (ac) ac->parent = a;
+    if (new_child) new_child->parent = screen;
-    else Core::getInstance().top_viewscreen = a;
+    else Core::getInstance().top_viewscreen = screen;
 }
 } }