fix - remove Windows not called on window close

diff --git a/src/Application.vala b/src/Application.vala
index c366623..b2d347c 100644 (file)
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -547,13 +547,14 @@ flutter-project  - create a flutter project in /tmp/test-flutter
                
                public static void removeWindow(Xcls_MainWindow w)
                {
-               
+                       //GLib.debug("remove window before = %d", BuilderApplication.windows.size);
                        BuilderApplication.windows.remove(w);
                        BuilderApplication.updateWindows();
                                
                        w.el.hide();
                        w.el.close();
                        w.el.destroy();
+                       //GLib.debug("remove window after = %d", BuilderApplication.windows.size);
                        
                        
                }

diff --git a/src/Builder4/MainWindow.bjs b/src/Builder4/MainWindow.bjs
index 2ffef3a..2d956ba 100644 (file)
--- a/src/Builder4/MainWindow.bjs
+++ b/src/Builder4/MainWindow.bjs
@@ -713,8 +713,15 @@
    "listeners" : {
     "close_request" : [
      "( ) => {",
+     "\t Resources.singleton().disconnect(_this.statusbar.handler_id);",
+     "\t ",
+     "\t BuilderApplication.removeWindow(this);",
+     "\t ",
+     "\t if (BuilderApplication.windows.size  < 1) {",
      "",
-     "\treturn false;",
+     "\t\tBuilderApplication.singleton(  null ).quit();",
+     "\t }",
+     "\treturn true;",
      "}",
      ""
     ],
@@ -722,14 +729,7 @@
      "() =>  {",
      " ",
      " ",
-     " Resources.singleton().disconnect(_this.statusbar.handler_id);",
-     " ",
-     " BuilderApplication.removeWindow(this);",
-     " ",
-     " if (BuilderApplication.windows.size  < 1) {",
      "",
-     "    BuilderApplication.singleton(  null ).quit();",
-     " }",
      "}"
     ],
     "show" : [

diff --git a/src/Builder4/MainWindow.vala b/src/Builder4/MainWindow.vala
index 92f7533..e5c8b87 100644 (file)
--- a/src/Builder4/MainWindow.vala
+++ b/src/Builder4/MainWindow.vala
@@ -62,8 +62,15 @@
 
             //listeners
             this.el.close_request.connect( ( ) => {
+                Resources.singleton().disconnect(_this.statusbar.handler_id);
+                
+                BuilderApplication.removeWindow(this);
+                
+                if (BuilderApplication.windows.size  < 1) {
             
-               return false;
+                       BuilderApplication.singleton(  null ).quit();
+                }
+               return true;
             });
             this.el.show.connect( ( ) => {
                 // hide the file editing..
@@ -84,14 +91,7 @@
             this.el.hide.connect( () =>  {
              
              
-             Resources.singleton().disconnect(_this.statusbar.handler_id);
-             
-             BuilderApplication.removeWindow(this);
-             
-             if (BuilderApplication.windows.size  < 1) {
             
-                BuilderApplication.singleton(  null ).quit();
-             }
             });
         }