Optimize code

KohrAhr · Oct 21, 2018 · 410d407 · 410d407
1 parent b30ca8c
commit 410d407
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/SCM_Notifier/MainForm.cs b/SCM_Notifier/MainForm.cs
@@ -25,6 +25,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Drawing;
@@ -1522,15 +1523,17 @@ private void sortListToolStripMenuItem_Click(object sender, EventArgs e)
         /// </returns>
         private SortOrder GetNextSortingMethod(SortOrder sortOrder)
         {
+            IEnumerable<SortOrder> sortOrders = Enum.GetValues(typeof(SortOrder)).Cast<SortOrder>();
+
             // current option is MAX ? reset to MIN
-            if (sortOrder == Enum.GetValues(typeof(SortOrder)).Cast<SortOrder>().Max())
+            if (sortOrder == sortOrders.Max())
             {
-                sortOrder = Enum.GetValues(typeof(SortOrder)).Cast<SortOrder>().Min();
+                sortOrder = sortOrders.Min();
             }
             else
             {
                 // get next option
-                sortOrder = Enum.GetValues(typeof(SortOrder)).Cast<SortOrder>().SkipWhile(x => x != sortOrder).Skip(1).First();
+                sortOrder = sortOrders.SkipWhile(x => x != sortOrder).Skip(1).First();
             }
 
             return sortOrder;
@@ -1542,15 +1545,21 @@ private SortOrder GetNextSortingMethod(SortOrder sortOrder)
         private void InitFoldersListView(ScmRepository[] newFolders)
         {
             folders.Clear();
-            foreach (ScmRepository item in newFolders)
+            try
             {
-                folders.Add(item);
+                foreach (ScmRepository item in newFolders)
+                {
+                    folders.Add(item);
+                }
+            }
+            finally
+            {
+                InitFoldersListView(folders);
             }
-            InitFoldersListView(folders);
         }
 
         /// <summary>
-            /// </summary>
+        /// </summary>
         /// <param name="folders"></param>
         private void InitFoldersListView(SvnFolderCollection folders)
         {