Clear read-only list on mod installation

hyperbx · Aug 25, 2019 · 2328afa · 2328afa
1 parent 7cd630c
commit 2328afa
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 20 deletions.
diff --git a/Sonic '06 Mod Manager/ModManager.cs b/Sonic '06 Mod Manager/ModManager.cs
@@ -67,7 +67,7 @@ namespace Sonic_06_Mod_Manager
 {
     public partial class ModManager : Form
     {
-        public static string versionNumber = "Version 1.12";
+        public static string versionNumber = "Version 1.13";
         public static string updateState;
         public static string serverStatus;
         public static string installState;
@@ -418,6 +418,7 @@ private void RefreshMods()
                 foreach (string mod in modArray)
                 {
                     var modName = mod.Remove(0, Path.GetDirectoryName(mod).Length);
+                    var getPlatform = File.ReadAllText($"{Path.Combine(modsPath, modName)}\\mod.ini");
                     modName = modName.Replace("\\", "");
                     if (Properties.Settings.Default.filter == 0)
                     {
@@ -427,7 +428,6 @@ private void RefreshMods()
                     {
                         if (File.Exists($"{Path.Combine(modsPath, modName)}\\mod.ini"))
                         {
-                            var getPlatform = File.ReadAllText($"{Path.Combine(modsPath, modName)}\\mod.ini");
                             if (getPlatform.Contains("Platform=\"Xbox 360\""))
                             {
                                 modList.Items.Add(modName);
@@ -438,7 +438,6 @@ private void RefreshMods()
                     {
                         if (File.Exists($"{Path.Combine(modsPath, modName)}\\mod.ini"))
                         {
-                            var getPlatform = File.ReadAllText($"{Path.Combine(modsPath, modName)}\\mod.ini");
                             if (getPlatform.Contains("Platform=\"PlayStation 3\""))
                             {
                                 modList.Items.Add(modName);
@@ -1731,6 +1730,7 @@ private void CopyMods()
                         string entryValue;
                         while ((line = configFile.ReadLine()) != null)
                         {
+                            filesToCopyList.Clear();
                             if (line.Contains("Read-only=\""))
                             {
                                 entryValue = line.Substring(line.IndexOf("=") + 2);
@@ -1770,6 +1770,7 @@ private void CopyMods()
                                         {
                                             if (string.Join(" ", filesToCopyList.ToArray()).Contains(Path.GetFileName(mod)))
                                             {
+                                                Console.WriteLine(string.Join(" ", filesToCopyList.ToArray()).Contains(Path.GetFileName(mod)));
                                                 Console.WriteLine("Copying " + mod);
 
                                                 if (File.Exists(origArcPath))
@@ -3083,24 +3084,11 @@ private void Radio_PlayStation_CheckedChanged(object sender, EventArgs e)
         private void Btn_SaveMods_Click(object sender, EventArgs e)
         {
             checkedModsList.Clear();
-            if (combo_Priority.SelectedIndex == 0)
+            for (int i = 0; i < modList.Items.Count; i++)
             {
-                for (int i = modList.Items.Count - 1; i >= 0; i--)
+                if (modList.GetItemChecked(i))
                 {
-                    if (modList.GetItemChecked(i))
-                    {
-                        checkedModsList.Add(modList.Items[i].ToString());
-                    }
-                }
-            }
-            else if (combo_Priority.SelectedIndex == 1)
-            {
-                for (int i = 0; i < modList.Items.Count; i++)
-                {
-                    if (modList.GetItemChecked(i))
-                    {
-                        checkedModsList.Add(modList.Items[i].ToString());
-                    }
+                    checkedModsList.Add(modList.Items[i].ToString());
                 }
             }
             checkedModsList.ForEach(i => Console.Write("{0}\n", i));

diff --git a/Sonic '06 Mod Manager/ModManager.resx b/Sonic '06 Mod Manager/ModManager.resx
@@ -175,6 +175,9 @@
   <metadata name="tm_CheckTab.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>308, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>60</value>
+  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAkAEBAAAAEAIABoBAAAlgAAABgYAAABACAAiAkAAP4EAAAgIAAAAQAgAKgQAACGDgAAMDAAAAEA

diff --git a/Sonic '06 Mod Manager/ModStatus.Designer.cs b/Sonic '06 Mod Manager/ModStatus.Designer.cs
diff --git a/Sonic '06 Mod Manager/Properties/AssemblyInfo.cs b/Sonic '06 Mod Manager/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.1.2")]
+[assembly: AssemblyFileVersion("1.1.3.0")]