From ae440e43891d7420c1e12a9f7b3d40c515ddd92f Mon Sep 17 00:00:00 2001
From: Markus Hofknecht <Markus@Hofknecht.eu>
Date: Tue, 4 Aug 2020 10:58:20 +0200
Subject: [PATCH] [BUG] Fix rare ArgumentOutOfRangeException (#132), [BUG] Fix
 rare NullReferenceException (#133)

---
 Business/KeyboardInput.cs      | 16 ++++++++++------
 Business/Menus.cs              |  2 +-
 Packaging/Package.appxmanifest |  2 +-
 Properties/AssemblyInfo.cs     |  4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Business/KeyboardInput.cs b/Business/KeyboardInput.cs
index 3e00e8f..df086d4 100644
--- a/Business/KeyboardInput.cs
+++ b/Business/KeyboardInput.cs
@@ -215,13 +215,17 @@ namespace SystemTrayMenu.Handler
 
             iRowKey = i;
             iMenuKey = newiMenuKey;
-            DataGridViewRow row = dgv.Rows[i];
-            RowData rowData = (RowData)row.Cells[2].Value;
-            rowData.IsSelected = true;
-            if (refreshview)
+
+            if (dgv.Rows.Count > i)
             {
-                row.Selected = false;
-                row.Selected = true;
+                DataGridViewRow row = dgv.Rows[i];
+                RowData rowData = (RowData)row.Cells[2].Value;
+                rowData.IsSelected = true;
+                if (refreshview)
+                {
+                    row.Selected = false;
+                    row.Selected = true;
+                }
             }
         }
 
diff --git a/Business/Menus.cs b/Business/Menus.cs
index 585c545..5ab50f8 100644
--- a/Business/Menus.cs
+++ b/Business/Menus.cs
@@ -456,7 +456,7 @@ namespace SystemTrayMenu.Business
                 // Case when Folder Dialog open
             }
             else if (openCloseState == OpenCloseState.Opening ||
-                (menus[0].Visible && openCloseState == OpenCloseState.Default))
+                (menus[0] != null && menus[0].Visible && openCloseState == OpenCloseState.Default))
             {
                 openCloseState = OpenCloseState.Closing;
                 MenusFadeOut();
diff --git a/Packaging/Package.appxmanifest b/Packaging/Package.appxmanifest
index 68ed661..10976f1 100644
--- a/Packaging/Package.appxmanifest
+++ b/Packaging/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="49543SystemTrayMenu.SystemTrayMenu"
     Publisher="CN=5884501C-92ED-45DE-9508-9D987C314243"
-    Version="1.0.11.0" />
+    Version="1.0.14.0" />
 
   <Properties>
     <DisplayName>SystemTrayMenu</DisplayName>
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 763dfea..ffe547f 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -39,5 +39,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.12.0")]
-[assembly: AssemblyFileVersion("1.0.12.0")]
+[assembly: AssemblyVersion("1.0.14.0")]
+[assembly: AssemblyFileVersion("1.0.14.0")]