tiny adjustments

AstroTechies · Jan 20, 2021 · 04d3c2c · 04d3c2c
1 parent 22c541c
commit 04d3c2c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/Form1.cs b/Form1.cs
@@ -667,12 +667,19 @@ private void Form1_Load(object sender, EventArgs e)
 
             // Initial resize of the menu to fit the table if necessary
             AMLUtils.InvokeUI(ForceTableToFit);
+
             AMLUtils.InvokeUI(ForceResize);
             AMLUtils.InvokeUI(ForceResize);
         }
 
         private void playButton_Click(object sender, EventArgs e)
         {
+            if (ModManager.CurrentlyAggregatingIndexFiles)
+            {
+                this.ShowBasicButton("Please wait until online mod aggregation is complete.", "OK", null, null);
+                return;
+            }
+
             ModManager.FullUpdate();
 
             if (!Program.CommandLineOptions.ServerMode)

diff --git a/ModHandler.cs b/ModHandler.cs
@@ -486,8 +486,10 @@ public void UpdateAvailableVersionsFromIndexFiles()
             }
         }
 
+        public bool CurrentlyAggregatingIndexFiles = false;
         public void AggregateIndexFiles()
         {
+            CurrentlyAggregatingIndexFiles = true;
             if (GlobalIndexFile == null) GlobalIndexFile = new Dictionary<string, IndexMod>();
             List<string> DuplicateURLs = new List<string>();
             foreach (Mod mod in Mods)
@@ -501,6 +503,7 @@ public void AggregateIndexFiles()
             }
 
             UpdateAvailableVersionsFromIndexFiles();
+            CurrentlyAggregatingIndexFiles = false;
         }
 
         public void SortVersions()
@@ -841,7 +844,7 @@ public void ApplyProfile(ModProfile prof, bool disableAllMods = true)
                     ModLookup[entry.Key].Priority = entry.Value.Priority;
                     ModLookup[entry.Key].IsOptional = entry.Value.IsOptional;
                     ModLookup[entry.Key].ForceLatest = entry.Value.ForceLatest;
-                    if (entry.Value.ForceLatest || !ModLookup[entry.Key].AvailableVersions.Contains(ModLookup[entry.Key].InstalledVersion))
+                    if (entry.Value.ForceLatest || !ModLookup[entry.Key].AllModData.ContainsKey(ModLookup[entry.Key].InstalledVersion))
                     {
                         ModLookup[entry.Key].InstalledVersion = ModLookup[entry.Key].AvailableVersions[0];
                     }

diff --git a/TableHandler.cs b/TableHandler.cs
@@ -18,11 +18,13 @@ internal class ColumnData
     {
         public string Name;
         public ColumnType Type;
+        public DataGridViewAutoSizeColumnMode OverrideSizeMode;
 
-        public ColumnData(string Name, ColumnType Type)
+        public ColumnData(string Name, ColumnType Type, DataGridViewAutoSizeColumnMode OverrideSizeMode = DataGridViewAutoSizeColumnMode.NotSet)
         {
             this.Name = Name;
             this.Type = Type;
+            this.OverrideSizeMode = OverrideSizeMode;
         }
     }
 
@@ -71,7 +73,8 @@ private void AddColumns(List<ColumnData> ourColumns)
                 }
 
                 dgc.AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCells;
-                if (i >= (ourColumns.Count - 1)) dgc.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                if (columnData.OverrideSizeMode != DataGridViewAutoSizeColumnMode.NotSet) dgc.AutoSizeMode = columnData.OverrideSizeMode;
+                //if (i >= (ourColumns.Count - 1)) dgc.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
 
                 dgc.SortMode = DataGridViewColumnSortMode.NotSortable;
                 GridView.Columns.Add(dgc);
@@ -125,8 +128,8 @@ private void RefreshInternal()
                 new ColumnData("Version", ColumnType.ComboBox),
                 new ColumnData("Author", ColumnType.Text),
                 new ColumnData("Game Build", ColumnType.Text),
-                ShouldContainOptionalColumn() ? new ColumnData("Optional?", ColumnType.CheckBox) : null,
-                new ColumnData("", ColumnType.Text)
+                ShouldContainOptionalColumn() ? new ColumnData("Optional?", ColumnType.CheckBox, DataGridViewAutoSizeColumnMode.ColumnHeader) : null,
+                //new ColumnData("", ColumnType.Text)
             });
 
             List<DataGridViewRow> newRows = new List<DataGridViewRow>();