Merge pull request JanKallman#149 from FROCHE38/patch-1

Bug Fix: ExcelWorksheets.Dispose with some application
slamj1 · Mar 4, 2018 · 02eaec6 · 02eaec6
2 parents d0f364b + bec6122
commit 02eaec6
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/EPPlus/ExcelWorksheets.cs b/EPPlus/ExcelWorksheets.cs
@@ -1261,13 +1261,16 @@ private void MoveSheetXmlNode(ExcelWorksheet sourceSheet, ExcelWorksheet targetS
 
 #endregion
         public void Dispose()
-        {            
-             foreach (var sheet in this._worksheets.Values) 
-             { 
-                 ((IDisposable)sheet).Dispose(); 
-             } 
-             _worksheets = null;
-             _pck = null;            
+        {    
+		if (_worksheets != null)
+	     	{
+		     foreach (var sheet in this._worksheets.Values) 
+		     { 
+			 ((IDisposable)sheet).Dispose(); 
+		     } 
+		     _worksheets = null;
+		     _pck = null;
+		}
         }
     } // end class Worksheets
 }