Fix mod menu sometimes opening empty

Author: krypciak

src/gui/list-entry.ts

@@ -28,6 +28,8 @@ declare global {
             modEntryActionButtons: sc.ButtonGui.Type & { ninepatch: ig.NinePatch }
             iconGui: ig.ImageGui
 
+            addObservers(this: this): void
+            removeObservers(this: this): void
             updateIcon(this: this, config: ModImageConfig): void
             tryDisableMod(this: this, mod: ModEntryLocal): string | undefined
             tryEnableMod(this: this, mod: ModEntryLocal): string | undefined
@@ -66,14 +68,14 @@ modmanager.gui.ListEntry = ig.FocusGui.extend({
 
     init(mod, modList) {
         this.parent()
+
         this.mod = mod
         this.modList = modList
 
         if (!mod.isLocal && mod.testingVersion && ModDB.isModTestingOptIn(mod.id)) {
             mod = mod.testingVersion
         }
 
-        sc.Model.addObserver(modmanager.gui.menu, this)
         const isGrid = Opts.isGrid
         FileCache.getIconConfig(mod).then(config => this.updateIcon(config))
 
@@ -171,6 +173,12 @@ modmanager.gui.ListEntry = ig.FocusGui.extend({
         }
         this.updateHighlightWidth()
     },
+    onAttach() {
+        sc.Model.addObserver(modmanager.gui.menu, this)
+    },
+    onDetach() {
+        sc.Model.removeObserver(modmanager.gui.menu, this)
+    },
     updateIcon(config) {
         const image = new ig.Image(config.path)
         this.iconGui = new ig.ImageGui(image, config.offsetX, config.offsetY, config.sizeX, config.sizeY)

src/gui/list.ts

@@ -78,7 +78,7 @@ declare global {
     }
 }
 
-export const modMenuListWidth = 552
+const modMenuListWidth = 552
 const modMenuListHeight = 240
 
 modmanager.gui.MenuList = sc.ListTabbedPane.extend({
@@ -206,8 +206,8 @@ modmanager.gui.MenuList = sc.ListTabbedPane.extend({
         return { skipSounds: true }
     },
     onContentCreation(index, settings) {
-        this.currentList && this.currentList.clear()
-        this.currentGroup && this.currentGroup.clear()
+        if (this.currentList) this.currentList.clear()
+        if (this.currentGroup) this.currentGroup.clear()
         return this.parent(index, settings)
     },
     onCreateListEntries(list, buttonGroup) {

src/gui/menu.ts

@@ -130,7 +130,6 @@ sc.Control.inject({
     },
 })
 
-let menuPurgeTimeoutId: NodeJS.Timeout
 modmanager.gui.Menu = sc.ListInfoMenu.extend({
     observers: [],
     init() {
@@ -460,7 +459,6 @@ modmanager.gui.Menu = sc.ListInfoMenu.extend({
         if (main?.topBar) main.topBar.doStateTransition(state)
     },
     showMenu() {
-        clearTimeout(menuPurgeTimeoutId)
         this.parent()
         sc.menu.pushBackCallback(() => this.onBackButtonPress())
         sc.menu.moveLeaSprite(0, 0, sc.MENU_LEA_STATE.HIDDEN)
@@ -490,7 +488,7 @@ modmanager.gui.Menu = sc.ListInfoMenu.extend({
 
         new modmanager.gui.ManualEnforcer('ModManagerManual', Lang.help.title, Lang.help.pages)
     },
-    hideMenu(_afterSubmenu, nextSubmenu) {
+    hideMenu() {
         this.parent()
         sc.menu.moveLeaSprite(0, 0, sc.MENU_LEA_STATE.LARGE)
         this.exitMenu()
@@ -520,15 +518,6 @@ modmanager.gui.Menu = sc.ListInfoMenu.extend({
             })
         }
 
-        if (nextSubmenu != sc.MENU_SUBMENU.MOD_OPTIONS) {
-            /* purging the menu immediately would disable the smooth fade out transition */
-            menuPurgeTimeoutId = setTimeout(() => {
-                const main = sc.menu.guiReference
-                main.removeChildGui(this)
-                this.removeObservers()
-                delete main.submenus[modsMenuId]
-            }, 1000)
-        }
     },
     onBackButtonPress() {
         sc.menu.popBackCallback()