Merge pull request az64#7 from Kjelli/fix-refactor

fixed nullreference in no-logic mode, and disabled controls when buil…
ProbablyButter · May 4, 2019 · cf42c1e · cf42c1e
2 parents 5271673 + 600f8a0
commit cf42c1e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Shuffle.cs b/Shuffle.cs
@@ -542,6 +542,9 @@ private void PrepareRulesetItemData()
         {
             string[] data = ReadRulesetFromResources();
 
+            ItemList = new List<ItemObject>();
+
+            // no logic
             if (data == null)
             {
                 for (var i = 0; i < Items.TotalNumberOfItems; i++)
@@ -555,8 +558,11 @@ private void PrepareRulesetItemData()
                     ItemList.Add(currentItem);
                 }
             }
+            else
+            {
+                PopulateItemList(data);
+            }
 
-            PopulateItemList(data);
             AddRequirementsForSongOath();
         }
 
@@ -569,8 +575,6 @@ private void AddRequirementsForSongOath()
 
         private void PopulateItemList(string[] data)
         {
-            ItemList = new List<ItemObject>();
-
             int itemId = 0;
             int lineNumber = 0;
 

diff --git a/fMain.cs b/fMain.cs
@@ -810,6 +810,7 @@ private void EnableAllControls(bool v)
             cCutsc.Enabled = v;
             cDChests.Enabled = v;
             cDEnt.Enabled = v;
+            cMode.Enabled = v;
             cDMult.Enabled = v;
             cDType.Enabled = v;
             cDummy.Enabled = v;
@@ -825,6 +826,7 @@ private void EnableAllControls(bool v)
             cVC.Enabled = v;
             cQText.Enabled = v;
             cSpoiler.Enabled = v;
+            cTatl.Enabled = v;
 
             bopen.Enabled = v;
             bRandomise.Enabled = v;