Revert "Fix for NullPointer Exception after column resize."

geo-at-github · geo-at-github · commit 89b87b0a4486 · 2018-03-03T17:55:43.000+01:00
This reverts commit 1c8e5b8. Add new fix.
diff --git a/UnityLauncher/App.config b/UnityLauncher/App.config
@@ -45,13 +45,6 @@
       <setting name="showGitBranchColumn" serializeAs="String">
         <value>False</value>
       </setting>
-      <setting name="gridColumnWidths" serializeAs="Xml">
-        <value>
-          <ArrayOfInt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-          </ArrayOfInt>
-        </value>
-      </setting>
     </UnityLauncher.Properties.Settings>
   </userSettings>
 </configuration>
diff --git a/UnityLauncher/Form1.cs b/UnityLauncher/Form1.cs
@@ -871,12 +871,21 @@ private void btnOpenLogFolder_Click(object sender, EventArgs e)
 
         private void gridRecent_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
         {
-            List<int> gridWidths = new List<int>(Properties.Settings.Default.gridColumnWidths);
+            List<int> gridWidths;
+            if (Properties.Settings.Default.gridColumnWidths != null )
+            {
+                gridWidths = new List<int>(Properties.Settings.Default.gridColumnWidths);
+            }
+            else
+            {
+                gridWidths = new List<int>();
+            }
+            
             // restore data grid view widths
             var colum = gridRecent.Columns[0];
             for (int i = 0; i < gridRecent.Columns.Count; ++i)
             {
-                if (Properties.Settings.Default.gridColumnWidths.Length > i)
+                if (Properties.Settings.Default.gridColumnWidths != null && Properties.Settings.Default.gridColumnWidths.Length > i)
                 {
                     gridWidths[i] = gridRecent.Columns[i].Width;
                 }

Original file line number	Diff line number	Diff line change
`@@ -871,12 +871,21 @@ private void btnOpenLogFolder_Click(object sender, EventArgs e)`
`871`	`871`
`872`	`872`	`private void gridRecent_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)`
`873`	`873`	`{`
`874`		`- List<int> gridWidths = new List<int>(Properties.Settings.Default.gridColumnWidths);`
	`874`	`+ List<int> gridWidths;`
	`875`	`+ if (Properties.Settings.Default.gridColumnWidths != null )`
	`876`	`+ {`
	`877`	`+ gridWidths = new List<int>(Properties.Settings.Default.gridColumnWidths);`
	`878`	`+ }`
	`879`	`+ else`
	`880`	`+ {`
	`881`	`+ gridWidths = new List<int>();`
	`882`	`+ }`
	`883`	`+`
`875`	`884`	`// restore data grid view widths`
`876`	`885`	`var colum = gridRecent.Columns[0];`
`877`	`886`	`for (int i = 0; i < gridRecent.Columns.Count; ++i)`
`878`	`887`	`{`
`879`		`- if (Properties.Settings.Default.gridColumnWidths.Length > i)`
	`888`	`+ if (Properties.Settings.Default.gridColumnWidths != null && Properties.Settings.Default.gridColumnWidths.Length > i)`
`880`	`889`	`{`
`881`	`890`	`gridWidths[i] = gridRecent.Columns[i].Width;`
`882`	`891`	`}`