Ticket #4397: 4397_selection_filter_order.2.patch

binaries/data/mods/mod/gui/modmod/modmod.js

@@ -270 +270 @@
 function resetFilters()
 {
     // Reset states of gui objects.
-    Engine.GetGUIObjectByName("modTypeFilter").selected = 0;
+    Engine.GetGUIObjectByName("modGenericFilter").caption = "";
     Engine.GetGUIObjectByName("negateFilter").checked = false;
-    Engine.GetGUIObjectByName("modGenericFilter").caption = "";
+    Engine.GetGUIObjectByName("isOrderDescending").checked = false;
 
     // NOTE: Calling generateModsLists() is not needed as the selection changes and that calls applyFilters()
+    Engine.GetGUIObjectByName("modTypeFilter").selected = 0;
 }
 
 function applyFilters()
 {
-    Engine.GetGUIObjectByName("modsAvailableList").selected = -1;
-    Engine.GetGUIObjectByName("modsEnabledList").selected = -1;
+    // Save selected rows
+    let modsAvailableList = Engine.GetGUIObjectByName("modsAvailableList");
+    let modsEnabledList = Engine.GetGUIObjectByName("modsEnabledList");
+    let selectedModAvailableFolder = modsAvailableList.list_modFolderName[modsAvailableList.selected];
+    let selectedModEnabledFolder = modsEnabledList.list_modFolderName[modsEnabledList.selected];
+
+    // Remove selected rows to prevent a link to a non existing item
+    modsAvailableList.selected = -1;
+    modsEnabledList.selected = -1;
+
     generateModsLists();
+
+    // Restore previously selected rows
+    modsAvailableList.selected = modsAvailableList.list_modFolderName.findIndex(folder => folder == selectedModAvailableFolder);
+    modsEnabledList.selected = modsEnabledList.list_modFolderName.findIndex(folder => folder == selectedModEnabledFolder);
 }
 
 /**