Alter how we close Word

cognidox · Jan 10, 2018 · 8564c0f · 8564c0f
1 parent 5f015c0
commit 8564c0f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/OfficeToPDF/ExcelConverter.cs b/OfficeToPDF/ExcelConverter.cs
@@ -629,7 +629,7 @@ protected static void setPageSetupProperties(Hashtable tps, PageSetup wps)
             }
         }
 
-        protected static bool closeExcelWorkbook(Workbook workbook)
+        private static bool closeExcelWorkbook(Workbook workbook)
         {
             int tries = 20;
             while (tries-- > 0)

diff --git a/OfficeToPDF/Properties/AssemblyInfo.cs b/OfficeToPDF/Properties/AssemblyInfo.cs
@@ -32,5 +32,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("1.8.6.0")]
-[assembly: AssemblyFileVersion("1.8.6.0")]
+[assembly: AssemblyVersion("1.8.7.0")]
+[assembly: AssemblyFileVersion("1.8.7.0")]
diff --git a/OfficeToPDF/WordConverter.cs b/OfficeToPDF/WordConverter.cs
@@ -374,12 +374,32 @@ class WordConverter: Converter
                 }
                 if (word != null && !running)
                 {
-                    ((_Application)word).Quit(ref oMissing, ref oMissing, ref oMissing);
+                    closeWordApplication(word);
                 }
                 Converter.releaseCOMObject(word);
             }
         }
 
+        // Try and close Word, giving time for Office to get
+        // itself in order
+        private static bool closeWordApplication(Application word)
+        {
+            object oMissing = System.Reflection.Missing.Value;
+            int tries = 20;
+            while (tries-- > 0)
+            {
+                try
+                {
+                    ((_Application)word).Quit(ref oMissing, ref oMissing, ref oMissing);
+                    return true;
+                }
+                catch (COMException)
+                {
+                    Thread.Sleep(500);
+                }
+            }
+            return false;
+        }
         // We want to be able to reset the options in Word so it doesn't affect subsequent
         // usage
         private class AppOption