fix file loading without json present, fix profile saving after button mapping

Author: blueminder

README.md

@@ -1,4 +1,4 @@
-# NullDC-NAOMI Netplay Launcher Distribution 0.6.5.2
+# NullDC-NAOMI Netplay Launcher Distribution 0.6.5.3
 Configuration optimized by blueminder *(June 30, 2020)*
 
 **Special Thanks**

nullDCNetplayLauncher/ControllerControl.cs

@@ -850,6 +850,7 @@ private void joystickBgWorker_RunWorkerCompleted(object sender, RunWorkerComplet
 
                 NetplayLaunchForm.EnableMapper = false;
                 launcherText = launcherText.Replace("enable_mapper=1", "enable_mapper=0");
+                launcherText = launcherText.Replace(player1_old, "player1=joy1");
                 cfgText = cfgText.Replace(player1_old, "player1=joy1");
 
                 var qjcPath = Launcher.rootDir + "nulldc-1-0-4-en-win//qkoJAMMA//" + JoystickName + ".qjc";
@@ -861,6 +862,7 @@ private void joystickBgWorker_RunWorkerCompleted(object sender, RunWorkerComplet
                 // prevent qkoJAMMA from changing controls on skipped face buttons or coin
                 // skipped controls work fine up until the moment you exit the nulldc first time
                 File.SetAttributes(qjcPath, FileAttributes.ReadOnly);
+
                 successText = $"\nNew qkoJAMMA Profile \"{JoystickName}\" Created\n\nExit any old instances of NullDC and \nclick \"Play Offline\" to test your controls.";
             }
             else
@@ -869,6 +871,8 @@ private void joystickBgWorker_RunWorkerCompleted(object sender, RunWorkerComplet
 
                 NetplayLaunchForm.EnableMapper = true;
                 launcherText = launcherText.Replace("enable_mapper=0", "enable_mapper=1");
+                launcherText = launcherText.Replace(player1_old, "player1=keyboard");
+
                 cfgText = cfgText.Replace(player1_old, "player1=keyboard");
 
                 successText = $"\nNew Keyboard Mapper Profile \"{JoystickName}\" Created\n\nExit any old instances of NullDC and \nclick \"Play Offline\" to test your controls.";

nullDCNetplayLauncher/NetplayLaunchForm.cs

@@ -427,41 +427,45 @@ private void cboGameSelect_SelectedIndexChanged(object sender, EventArgs e)
             string RomDir = NullDir + "roms\\";
 
             bool ReferenceFound = false;
-            Launcher.Game SelectedGame = Launcher.GamesJson.Where(g => g.Name == cboGameSelect.Text).FirstOrDefault();
-            if (SelectedGame != null)
-                ReferenceFound = (SelectedGame.ReferenceUrl != null);
-            if ((string)cboGameSelect.Text != "" && (string)cboGameSelect.SelectedValue == "" && ReferenceFound)
+            if (Launcher.GamesJson != null && Launcher.GamesJson.Count > 0)
             {
-                btnOffline.Enabled = false;
-                btnJoin.Enabled = false;
-                btnHost.Enabled = false;
-                DialogResult dialogResult = MessageBox.Show(
-                    $"{cboGameSelect.Text} not installed.\nWould you like to retrieve it?", 
-                    "Missing ROM", 
-                    MessageBoxButtons.YesNo);
-                switch(dialogResult)
+                Launcher.Game SelectedGame = Launcher.GamesJson.Where(g => g.Name == cboGameSelect.Text).FirstOrDefault();
+                if (SelectedGame != null)
+                    ReferenceFound = (SelectedGame.ReferenceUrl != null);
+
+
+                if ((string)cboGameSelect.Text != "" && (string)cboGameSelect.SelectedValue == "" && ReferenceFound)
                 {
-                    case (DialogResult.Yes):
-                        Program.ShowConsoleWindow();
-                        Console.Clear();
-                        NetworkQuery.DownloadReferenceUrl(SelectedGame);
-                        Program.HideConsoleWindow();
-                        var previous = cboGameSelect.SelectedIndex;
-                        ReloadRomList();
-                        cboGameSelect.SelectedIndex = previous;
-                        break;
-                    case (DialogResult.No):
-                        break;
+                    btnOffline.Enabled = false;
+                    btnJoin.Enabled = false;
+                    btnHost.Enabled = false;
+                    DialogResult dialogResult = MessageBox.Show(
+                        $"{cboGameSelect.Text} not installed.\nWould you like to retrieve it?",
+                        "Missing ROM",
+                        MessageBoxButtons.YesNo);
+                    switch (dialogResult)
+                    {
+                        case (DialogResult.Yes):
+                            Program.ShowConsoleWindow();
+                            Console.Clear();
+                            NetworkQuery.DownloadReferenceUrl(SelectedGame);
+                            Program.HideConsoleWindow();
+                            var previous = cboGameSelect.SelectedIndex;
+                            ReloadRomList();
+                            cboGameSelect.SelectedIndex = previous;
+                            break;
+                        case (DialogResult.No):
+                            break;
+                    }
                 }
-            }
-            else if (cboGameSelect.SelectedValue != null)
-            {
-                btnOffline.Enabled = true;
-                btnJoin.Enabled = true;
-                btnHost.Enabled = true;
-                Launcher.SelectedGame = cboGameSelect.SelectedValue.ToString();
-            }
-                
+                else if (cboGameSelect.SelectedValue != null)
+                {
+                    btnOffline.Enabled = true;
+                    btnJoin.Enabled = true;
+                    btnHost.Enabled = true;
+                    Launcher.SelectedGame = cboGameSelect.SelectedValue.ToString();
+                }
+            }    
 
         }
 

nullDCNetplayLauncher/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.6.5.2")]
-[assembly: AssemblyFileVersion("0.6.5.2")]
+[assembly: AssemblyVersion("0.6.5.3")]
+[assembly: AssemblyFileVersion("0.6.5.3")]