Bug fixes related to adding a new launcher

Author: ReplicaObscura

Lib/Launchpad/Config/AppConfig.ahk

@@ -196,7 +196,13 @@
 
     SelectLauncherFile(existingFile) {
         MsgBox("Launchpad uses a Launcher File to keep a list of games and settings for your launchers. The file is in JSON format and can be edited by hand or through the Launcher Manager in Launchpad.`n`nIf you have an existing Launcher File, select it on the following screen. If you want to create a new one, browse to the folder you would like and type in a new .json filename to use.", "Launchpad Launcher File", "OK")
-        return FileSelect(3, existingFile, "Select the or create the Launcher File you would like Launchpad to use.", "JSON Documents (*.json)")
+        path := FileSelect(8, existingFile, "Select or create the Launcher File you would like Launchpad to use.", "JSON Documents (*.json)")
+
+        if (!FileExist(path)) {
+            FileAppend("{`"Games`": {}}", path)
+        }
+
+        return path
     }
 
     OpenAssetsDir() {

Lib/Launchpad/Entity/LauncherEntity.ahk

@@ -66,6 +66,7 @@ class LauncherEntity extends EntityBase {
     __New(app, key, config, requiredConfigKeys := "", parentEntity := "") {
         super.__New(app, key, config, requiredConfigKeys, parentEntity)
         this.children["ManagedLauncher"] := ManagedLauncherEntity.new(app, key, config, "", this)
+        this.entityData.SetLayer("auto", this.AutoDetectValues()) ; Re-detect values now that children are loaded, @todo make this run only once
     }
 
     /**
@@ -155,7 +156,7 @@ class LauncherEntity extends EntityBase {
 
             if (FileExist(checkPath)) {
                 detectedValues["IconSrc"] := checkPath
-            } else if (this.ManagedLauncher.ManagedGame.GetValue("Exe") != "") {
+            } else if (this.children.Has("ManagedLauncher") and this.ManagedLauncher.ManagedGame.GetConfigValue("Exe") != "") {
                 detectedValues["IconSrc"] := this.ManagedLauncher.ManagedGame.LocateExe()
             }
         }

Lib/Launchpad/Window/LauncherEditor.ahk

@@ -116,7 +116,7 @@ class LauncherEditor extends EntityEditorBase {
 
         if (diff != "" and diff.HasChanges()) {
             if (diff.ValueIsModified("LauncherType")) {
-                this.guiObj["LauncherType"].Value := this.GetItemIndex(this.launcherTypes, entity.GetValue("Type"))
+                this.guiObj["LauncherType"].Value := this.GetItemIndex(this.launcherTypes, entity.GetConfigValue("Type"))
             }
         }
     }
@@ -127,7 +127,7 @@ class LauncherEditor extends EntityEditorBase {
 
         if (diff != "" and diff.HasChanges()) {
             if (diff.ValueIsModified("GameType")) {
-                this.guiObj["GameType"].Value := this.GetItemIndex(this.gameTypes, entity.GetValue("Type"))
+                this.guiObj["GameType"].Value := this.GetItemIndex(this.gameTypes, entity.GetConfigValue("Type"))
             }
         }
     }