eda/gui: Fixed active window confusion

- When coming back from a modal dialog, clicking a FieldDataBox would no longer activate it

diff --git a/eda/libeda/src/gui.ec b/eda/libeda/src/gui.ec
index 04a9216..c27b472 100644 (file)
--- a/eda/libeda/src/gui.ec
+++ b/eda/libeda/src/gui.ec
@@ -495,8 +495,22 @@ public:
    {
       if(!active)
       {
-         if(modifiedDocument && !DataBox::SaveData())
-            Refresh();
+         if(modifiedDocument)
+         {
+            bool thisActive = this.active;
+            bool parentActive = parent.active;
+            Window parentActiveChild = parent.activeChild;
+
+            if(!DataBox::SaveData())
+               Refresh();
+            else
+            {
+               if(this.active == thisActive && parentActive == parent.active && parentActiveChild == parent.activeChild)
+                  ;
+               else
+                  *goOnWithActivation = false;
+            }
+         }
       }
       return true;
    }