Merge pull request #17 from MopsieX/crash-fix

fixes crash on Launch button press
MopsieX · Aug 27, 2019 · d456ea6 · d456ea6
2 parents 5ef74de + ef6d8e7
commit d456ea6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/SingleplayerLauncher/Hero.cs b/SingleplayerLauncher/Hero.cs
@@ -66,7 +66,7 @@ public static Hero Instance
                                                                                 };
         private static readonly byte[] StartHeaderAfterGuardiansMaximillian = new byte[] { };
 
-        private void ApplySkin()
+        public void ApplySkin()
         {
             int skinIndex = UPKFile.FindBytesKMP(SkinPatternMaximilian, HeroObjectOffsetMaximilian) + SkinPatternMaximilian.Length;
             UPKFile.OverrideBytes(Resources.skins[NameMaximilian][skin], skinIndex);
@@ -77,7 +77,7 @@ public void ApplyLoadoutChanges()
             ApplyTrapsGear();
             //ApplyGuardians();
             //ApplyTraits();
-            ApplySkin();
+            //ApplySkin();
         }
 
         private void ApplyTrapsGear()

diff --git a/SingleplayerLauncher/LauncherMainForm.cs b/SingleplayerLauncher/LauncherMainForm.cs
@@ -194,9 +194,10 @@ private void btnLaunch_Click(object sender, EventArgs e)
                 UpdateCharacterDataIni();
                 UpdateDefaultGameIni();
             }
-            if (!comBoxSkin.SelectedItem.ToString().Equals("") || LoadoutEditorForm.bytes.Count > 0)
+            if (comBoxSkin.SelectedItem != null || LoadoutEditorForm.bytes.Count > 0)
             {
                 hero.skin = comBoxSkin.SelectedItem.ToString();
+                hero.ApplySkin();
             }
 
             hero.ApplyLoadoutChanges();