[mapguide-commits] r6768 - trunk/Tools/Maestro/Thirdparty/WinFormsUI/Docking

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Thu Jun 14 09:06:23 PDT 2012


Author: jng
Date: 2012-06-14 09:06:22 -0700 (Thu, 14 Jun 2012)
New Revision: 6768

Modified:
   trunk/Tools/Maestro/Thirdparty/WinFormsUI/Docking/DockContentHandler.cs
Log:
Mono compatibility fix. This fixes the stack vomit to console when Maestro exits.

Modified: trunk/Tools/Maestro/Thirdparty/WinFormsUI/Docking/DockContentHandler.cs
===================================================================
--- trunk/Tools/Maestro/Thirdparty/WinFormsUI/Docking/DockContentHandler.cs	2012-06-14 15:54:45 UTC (rev 6767)
+++ trunk/Tools/Maestro/Thirdparty/WinFormsUI/Docking/DockContentHandler.cs	2012-06-14 16:06:22 UTC (rev 6768)
@@ -33,12 +33,17 @@
 			GC.SuppressFinalize(this);
 		}
 
+        private bool m_inProcessOfDisposing = false; //variable to guard against potential infinite disposal loop in mono
+
 		protected virtual void Dispose(bool disposing)
 		{
+            if (m_inProcessOfDisposing)
+                return;
 			if(disposing)
 			{
 				lock(this)
 				{
+                    m_inProcessOfDisposing = true;
 					DockPanel = null;
 					if (m_autoHideTab != null)
 						m_autoHideTab.Dispose();



More information about the mapguide-commits mailing list