2008-03-11 Ivan N. Zlatev <contact@i-nz.net>

* DesignTime/CodeProviderDesignerLoader.cs: Guard against a NRE in ReportErrors if the error collection is null. svn path=/trunk/mwf-designer/; revision=98268
mono · Mar 14, 2008 · fe07bfa · fe07bfa
1 parent e76f609
commit fe07bfa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-11  Ivan N. Zlatev  <contact@i-nz.net>
+
+	* DesignTime/CodeProviderDesignerLoader.cs: Guard against a NRE in 
+	ReportErrors if the error collection is null. 
+
 2008-03-02  Ivan N. Zlatev  <contact@i-nz.net>
 
 	* Enable Undo, Redo, Cut, Copy, Paste, Delete as I've already implmented

diff --git a/Makefile b/Makefile
@@ -36,7 +36,7 @@ mono-design-run:
 	cd ${MD_BUILD_DIR};mono --debug mwf-designer.exe
 
 mono-design-msnet:
-	csc -debug -d:NET_2_0 -t:library -r:System.Design.dll,System.Windows.Forms.dll,System.Drawing.dll,System.Data.dll,..\build\Mono.Design.dll,..\build\ICSharpCode.NRefactory.dll -out:..\build\mwf-designer.exe src\*.cs src\*\*.cs
+	csc -debug -d:NET_2_0 -t:library -r:System.Design.dll,System.Windows.Forms.dll,System.Drawing.dll,System.Data.dll,..\build\Mono.Design.dll,..\build\ICSharpCode.NRefactory.dll -out:..\build\mwf-designer.exe src\*.cs src\*\*.cs src\*\*\*.cs
 
 
 
diff --git a/src/DesignTime/CodeProviderDesignerLoader.cs b/src/DesignTime/CodeProviderDesignerLoader.cs
@@ -86,6 +86,9 @@ protected override void ReportFlushErrors (ICollection errors)
 
 		private void ReportErrors (ICollection errors)
 		{
+			if (errors == null)
+				return;
+
 			IUIService service = base.GetService (typeof (IUIService)) as IUIService;
 			if (service != null) {
 				foreach (object error in errors) {

diff --git a/src/DesignTime/UndoRedoEngine.cs b/src/DesignTime/UndoRedoEngine.cs
@@ -121,7 +121,7 @@ protected override void Dispose (bool disposing)
 				_undoUnits.Clear ();
 				_redoUnits.Clear ();
 			}
-			base.Dispose ();
+			base.Dispose (disposing);
 		}
 	}
 }