Author: mkrueger
Date: 2007-08-28 07:56:03 -0400 (Tue, 28 Aug 2007)
New Revision: 84944

Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs
   
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
Log:
* MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs,
  MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs: Fixed 81660+82491: Crash
  when opening the Welcome-Page manually.

Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-08-28 
11:52:26 UTC (rev 84943)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog        2007-08-28 
11:56:03 UTC (rev 84944)
@@ -1,3 +1,9 @@
+2007-08-28  Mike Krüger <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs,
+         MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs: Fixed 81660+82491: Crash 
when
+         opening the Welcome-Page manually.
+
 2007-08-24  Mike Krüger <[EMAIL PROTECTED]> 
 
        * MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs: Fixed 82554: 
Creating new

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs
   2007-08-28 11:52:26 UTC (rev 84943)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractBaseViewContent.cs
   2007-08-28 11:56:03 UTC (rev 84944)
@@ -42,6 +42,8 @@
                
                public virtual void Dispose()
                {
+                       if (Control != null)
+                               Control.Dispose ();                             
                }
                
                public virtual bool CanReuseView (string fileName)

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
        2007-08-28 11:52:26 UTC (rev 84943)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs
        2007-08-28 11:56:03 UTC (rev 84944)
@@ -237,7 +237,6 @@
                        content.ContentChanged     -= new EventHandler 
(OnContentChanged);
                        content.WorkbenchWindow = null;
                        
-                       
                        if (subViewContents != null) {
                                foreach (ISecondaryViewContent sv in 
subViewContents) {
                                        subViewNotebook.Remove (sv.Control);
@@ -245,6 +244,8 @@
                                }
                                this.subViewContents = null;
                                subViewNotebook.Remove (content.Control);
+                       } else {
+                               this.Remove (content.Control);
                        }
                        content.Dispose ();
                        tabLabel.Dispose ();

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to