Fixed a crash when a window would auto-close but remain listed as a tiling suggestion.

All windows that close while suggestions are visible are now removed from the suggestion list.

Author: rxappdev

src/contents/ui/AutoTiler.qml

@@ -631,7 +631,7 @@ QtObject {
             let windowIndex = data.index;
             logAutoTiler('i: ' + i + ' w: ' + windowIndex);
             logAutoTiler('RETILE 2.1 - width before: ' + mapping.windows[windowIndex].width);
-            root.moveAndResizeWindow(mapping.windows[windowIndex], data.geometry);
+            root.moveAndResizeWindow(mapping.windows[windowIndex], data.geometry, true);
             logAutoTiler('RETILE 2.2 - width after: ' + mapping.windows[windowIndex].width);
             isVisible[windowIndex] = true;
             if (updateLayerKeepBelow) {
@@ -735,7 +735,7 @@ QtObject {
                     logAutoTiler('INSERT Z ---- currentMapping.geometries: ' + currentMapping.geometries.length + ' wanted: ' + geometryIndex);
                     let geometry = JSON.parse(JSON.stringify(currentMapping.geometries[geometryIndex]));
                     root.addMargins(geometry, true, true, true, true);
-                    root.moveAndResizeWindow(window, geometry);
+                    root.moveAndResizeWindow(window, geometry, false);
                     return;
                 }
                 logAutoTiler('INSERT Z index: ' + index);
@@ -917,7 +917,7 @@ QtObject {
                 let geometry = JSON.parse(JSON.stringify(currentMapping.geometries[geometryIndex]));
                 disableAutoTiling(window);
                 root.addMargins(geometry, true, true, true, true);
-                root.moveAndResizeWindow(window, geometry);
+                root.moveAndResizeWindow(window, geometry, false);
             } else if (currentMapping.id == previousMapping.id) {
                 logAutoTiler('windowDropped 5 target index: ' + targetIndex);
 

src/contents/ui/WindowSuggestions.qml

@@ -244,34 +244,55 @@ PlasmaCore.Dialog {
             let index = localWindows.indexOf(window);
             if (index != -1) {
                 localWindows.splice(index, 1);
-            }
 
-            if (!window.desktops.includes(currentDesktop)) {
-                window.desktops = [currentDesktop];
-            }
-            if (!window.activities.includes(currentActivity)) {
-                window.activities = [currentActivity];
-            }
-            if (window.mt_auto) {
-                autoTiler.disableAutoTiling(window);
-            }
-            if (window.minimized) {
-                window.minimized = false;
+                if (!window.desktops.includes(currentDesktop)) {
+                    window.desktops = [currentDesktop];
+                }
+                if (!window.activities.includes(currentActivity)) {
+                    window.activities = [currentActivity];
+                }
+                if (window.mt_auto) {
+                    autoTiler.disableAutoTiling(window);
+                }
+                if (window.minimized) {
+                    window.minimized = false;
+                }
+                root.moveAndResizeWindow(window, geometry);
+                Workspace.raiseWindow(window);
+
+                activeIndex = 0;
+
+                if (localWindows.length == 0 || convertedOverlay.length == 0) {
+                    windowSuggestions.visible = false;
+                    validWindows = [];
+                } else {
+                    validWindows = localWindows;
+                    if (suggestionsInsideTile) {
+                        updateSizes();
+                    }
+                    updateOffsets();
+                }
             }
-            root.moveAndResizeWindow(window, geometry);
-            Workspace.raiseWindow(window);
+        }
+    }
 
-            activeIndex = 0;
+    function windowClosed(window) {
+        log('Closed window caption: ' + window.caption);
 
-            if (localWindows.length == 0 || convertedOverlay.length == 0) {
-                windowSuggestions.visible = false;
-                validWindows = [];
-            } else {
-                validWindows = localWindows;
-                if (suggestionsInsideTile) {
-                    updateSizes();
+        if (activeIndex != -1 && validWindows.length > 0) {
+            let localWindows = [...validWindows];
+            let index = localWindows.indexOf(window);
+            if (index != -1) {
+                localWindows.splice(index, 1);
+
+                if (localWindows.length == 0) {
+                    validWindows = [];
+                } else {
+                    validWindows = localWindows;
+                    if (suggestionsInsideTile) {
+                        updateSizes();
+                    }
                 }
-                updateOffsets();
             }
         }
     }

src/contents/ui/main.qml

@@ -792,6 +792,7 @@ SPECIAL_AUTO_TILER_3`;
                 doCleanup();
             }
             autoTiler.windowClosed(client);
+            windowSuggestions.windowClosed(client);
             disconnectAll();
             removeEmptyVirtualDesktops();
         }
@@ -1127,7 +1128,15 @@ SPECIAL_AUTO_TILER_3`;
         }
     }
 
-    function moveAndResizeWindow(window, geometry) {
+    function moveAndResizeWindow(window, geometry, autoTile = false) {
+        if (autoTile && !autoTiler.isValidAutoTileWindow(window)) {
+            logE('Not a valid auto tile window anymore!');
+            return false;
+        } else if (!isValidWindow(window)) {
+            logE('Not a valid window anymore!');
+            return false;
+        }
+
         log('Moving and resizing: ' + window.caption);
         if (window.resizeable) {
             if (geometry.width > 20 && geometry.height > 20) {
@@ -1136,6 +1145,7 @@ SPECIAL_AUTO_TILER_3`;
         } else {
             window.frameGeometry = Qt.rect(geometry.x, geometry.y, window.width, window.height);
         }
+        return true;
     }
 
     function updateWindowVisibility() {

src/metadata.json

@@ -10,7 +10,7 @@
         "Description": "Tile your windows with minimal effort",
         "Icon": "preferences-desktop-virtual",
         "Id": "mousetiler",
-        "Version": "6.2.0",
+        "Version": "6.2.1",
         "License": "GPLv3",
         "Website": "https://github.com/rxappdev/MouseTiler"
     },