From 97eed32e16e4bede94861783a378e94f90904682 Mon Sep 17 00:00:00 2001 From: ASNiVOR Date: Tue, 18 Jul 2017 22:44:50 +0100 Subject: [PATCH 1/9] Fixed netplay exception issue - #147 --- MedLaunch/Classes/GameLauncher.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MedLaunch/Classes/GameLauncher.cs b/MedLaunch/Classes/GameLauncher.cs index e6667a6..bd4ce33 100644 --- a/MedLaunch/Classes/GameLauncher.cs +++ b/MedLaunch/Classes/GameLauncher.cs @@ -512,25 +512,25 @@ public string GetCommandLineArguments() // add password and gamekey fields from id 100 // password - if (ServerOveride.netplay__password == null || ServerOveride.netplay__password.Trim() == "") + if (Server.netplay__password == null || Server.netplay__password == "") { // no password set - apply blank baseStr += "-netplay.password \"\"" + sep; } else { - baseStr += "-netplay.password " + Validate(ServerOveride.netplay__password) + sep; + baseStr += "-netplay.password " + Validate(Server.netplay__password) + sep; } // gamekey - if (ServerOveride.netplay__gamekey == null || ServerOveride.netplay__gamekey.Trim() == "") + if (Server.netplay__gamekey == null || Server.netplay__gamekey == "") { // no gamekey set - set blank baseStr += "-netplay.gamekey \"\"" + sep; } else { - baseStr += "-netplay.gamekey " + Validate(ServerOveride.netplay__gamekey) + sep; + baseStr += "-netplay.gamekey " + Validate(Server.netplay__gamekey) + sep; } } From 2ec8d1eac7a847cc0676f75d1d9624a157a188e0 Mon Sep 17 00:00:00 2001 From: ASNiVOR Date: Tue, 18 Jul 2017 22:51:20 +0100 Subject: [PATCH 2/9] Added additional whitespace checks in password & gamekey - #147 --- MedLaunch/Classes/GameLauncher.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MedLaunch/Classes/GameLauncher.cs b/MedLaunch/Classes/GameLauncher.cs index bd4ce33..feceb9b 100644 --- a/MedLaunch/Classes/GameLauncher.cs +++ b/MedLaunch/Classes/GameLauncher.cs @@ -509,10 +509,10 @@ public string GetCommandLineArguments() baseStr += "-netplay.port " + Validate(Server.netplay__port.ToString()) + sep; } - // add password and gamekey fields from id 100 + // add password and gamekey fields from Server row // password - if (Server.netplay__password == null || Server.netplay__password == "") + if (Server.netplay__password == null || Server.netplay__password.Trim() == "") { // no password set - apply blank baseStr += "-netplay.password \"\"" + sep; @@ -523,7 +523,7 @@ public string GetCommandLineArguments() } // gamekey - if (Server.netplay__gamekey == null || Server.netplay__gamekey == "") + if (Server.netplay__gamekey == null || Server.netplay__gamekey.Trim() == "") { // no gamekey set - set blank baseStr += "-netplay.gamekey \"\"" + sep; From 2716cb54e3ff7b935da7c19332e2f7e9ac993042 Mon Sep 17 00:00:00 2001 From: ASNiVOR Date: Wed, 19 Jul 2017 12:41:29 +0100 Subject: [PATCH 3/9] fix for folder loop issue - #141 --- MedLaunch/MainWindow.xaml.cs | 7 ++----- MedLaunch/Models/Paths.cs | 7 +++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/MedLaunch/MainWindow.xaml.cs b/MedLaunch/MainWindow.xaml.cs index da302da..5e5c1a5 100644 --- a/MedLaunch/MainWindow.xaml.cs +++ b/MedLaunch/MainWindow.xaml.cs @@ -1960,12 +1960,9 @@ private void btnPathMednafen_Click(object sender, RoutedEventArgs e) if (path.SelectedPath != "") { - string strPath = path.SelectedPath; - - - + string strPath = path.SelectedPath; tbPathMednafen.Text = strPath; - + Paths.SaveMednafenPath(strPath); UpdateCheckMednafen(); } diff --git a/MedLaunch/Models/Paths.cs b/MedLaunch/Models/Paths.cs index bfa347e..a85f926 100644 --- a/MedLaunch/Models/Paths.cs +++ b/MedLaunch/Models/Paths.cs @@ -141,6 +141,13 @@ public static void SavePathSettings(TextBox tbPathMednafen, TextBox tbPathGb, Te SetPaths(paths); } + public static void SaveMednafenPath(string path) + { + Paths paths = Paths.GetPaths(); + paths.mednafenExe = path; + SaveToDatabase(new List { paths }); + } + public static bool isMednafenPathValid() { bool pathWorking = false; From b7d652f303d9ed489997cb6b85494771b52b83cb Mon Sep 17 00:00:00 2001 From: ASNiVOR Date: Wed, 19 Jul 2017 12:46:45 +0100 Subject: [PATCH 4/9] Fixed import config prompt always appearing on application launch when user has previously said NO to this during initial setup - #148 --- MedLaunch/Models/Paths.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MedLaunch/Models/Paths.cs b/MedLaunch/Models/Paths.cs index a85f926..e109735 100644 --- a/MedLaunch/Models/Paths.cs +++ b/MedLaunch/Models/Paths.cs @@ -265,6 +265,12 @@ public static void InitM() gs.bypassConfig = true; GlobalSettings.SetGlobals(gs); } + + else + { + gs.bypassConfig = true; + GlobalSettings.SetGlobals(gs); + } } // if option is selected make a backup of the mednafen config file From b9d074cda228fbdb303a25a45730a762f233f683 Mon Sep 17 00:00:00 2001 From: ASNiVOR Date: Wed, 19 Jul 2017 13:27:05 +0100 Subject: [PATCH 5/9] added note to UI that snes ports 3-8 are gamepad only - #149 --- MedLaunch/MainWindow.xaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MedLaunch/MainWindow.xaml b/MedLaunch/MainWindow.xaml index 39003fd..1ed7c70 100644 --- a/MedLaunch/MainWindow.xaml +++ b/MedLaunch/MainWindow.xaml @@ -7327,6 +7327,8 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro Super Scope + +