Merge branch 'release-7.2.12'

bovender · Jul 16, 2017 · 04703e0 · 04703e0
2 parents 43b7c58 + c16243b
commit 04703e0
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 16 deletions.
diff --git a/Tests/Properties/AssemblyInfo.cs b/Tests/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // 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("7.2.11.0")]
-[assembly: AssemblyFileVersion("7.2.11.0")]
+[assembly: AssemblyVersion("7.2.12.0")]
+[assembly: AssemblyFileVersion("7.2.12.0")]
diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-7.2.11
-7.2.11.0
+7.2.12
+7.2.12.0
diff --git a/XLToolbox/Excel/ViewModels/Instance.cs b/XLToolbox/Excel/ViewModels/Instance.cs
@@ -490,13 +490,21 @@ public void EnableScreenUpdating()
         /// </summary>
         public void DisableDisplayAlerts()
         {
+            Logger.Debug("DisableDisplayAlerts: counter = {0}", _disableDisplayAlerts);
             if (_disableDisplayAlerts == 0)
             {
-                Logger.Info("Disable displaying of alerts");
                 _wasDisplayingAlerts = Application.DisplayAlerts;
             }
-            Application.DisplayAlerts = false;
-            _disableDisplayAlerts++;
+            try
+            {
+                Application.DisplayAlerts = false;
+                _disableDisplayAlerts++;
+            }
+            catch (System.Runtime.InteropServices.COMException e)
+            {
+                Logger.Warn("DisableDisplayAlerts: COMException occurrred");
+                Logger.Warn(e);
+            }
         }
 
         /// <summary>
@@ -507,12 +515,20 @@ public void DisableDisplayAlerts()
         /// </summary>
         public void EnableDisplayAlerts()
         {
-            _disableDisplayAlerts--;
-            if (_disableDisplayAlerts <= 0)
+            Logger.Debug("EnableDisplayAlerts: counter = {0}", _disableDisplayAlerts);
+            if (_disableDisplayAlerts == 1)
             {
-                Logger.Info("Enable displaying of alerts");
-                _disableDisplayAlerts = 0;
-                Application.DisplayAlerts = _wasDisplayingAlerts;
+                try
+                {
+                    Logger.Debug("EnableDisplayAlerts: _wasDisplayingAlerts = {0}", _wasDisplayingAlerts);
+                    Application.DisplayAlerts = _wasDisplayingAlerts;
+                    _disableDisplayAlerts--;
+                }
+                catch (System.Runtime.InteropServices.COMException e)
+                {
+                    Logger.Warn("EnableDisplayAlerts: COMException occurrred");
+                    Logger.Warn(e);
+                }
             }
         }
 

diff --git a/XLToolbox/Properties/AssemblyInfo.cs b/XLToolbox/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // 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("7.2.11.0")]
-[assembly: AssemblyFileVersion("7.2.11.0")]
+[assembly: AssemblyVersion("7.2.12.0")]
+[assembly: AssemblyFileVersion("7.2.12.0")]
diff --git a/XLToolboxForExcel/Properties/AssemblyInfo.cs b/XLToolboxForExcel/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // 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("7.2.11.0")]
-[assembly: AssemblyFileVersion("7.2.11.0")]
+[assembly: AssemblyVersion("7.2.12.0")]
+[assembly: AssemblyFileVersion("7.2.12.0")]
 
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
-Original file line number
+Diff line change
@@ -1,2 +1,2 @@
-.2.11
-.2.11.0
+.2.12
+.2.12.0