tomboy r2138 - in trunk: . Tomboy/Addins/Tasque

[sharm svn gnome org]

Author: sharm
Date: Sun Sep 14 22:18:10 2008
New Revision: 2138
URL: http://svn.gnome.org/viewvc/tomboy?rev=2138&view=rev

Log:
* Tomboy/Addins/Tasque/TasqueNoteAddin.cs: Prevent null object
  exceptions when shutting down the Tasque add-in (think
  deleted/closed notes, etc).

Modified:
   trunk/ChangeLog
   trunk/Tomboy/Addins/Tasque/TasqueNoteAddin.cs

Modified: trunk/Tomboy/Addins/Tasque/TasqueNoteAddin.cs
==============================================================================
--- trunk/Tomboy/Addins/Tasque/TasqueNoteAddin.cs	(original)
+++ trunk/Tomboy/Addins/Tasque/TasqueNoteAddin.cs	Sun Sep 14 22:18:10 2008
@@ -40,9 +40,12 @@
 		{
 			// The following two lines are required to prevent the plugin
 			// from leaking references when the plugin is disabled.
-			menu.Hidden -= OnMenuHidden;
-			menuToolButton.Clicked -= OnMenuToolButtonClicked;
-			menuToolButton.ShowMenu -= OnMenuItemActivated;
+			if (menu != null)
+				menu.Hidden -= OnMenuHidden;
+			if (menuToolButton != null) {
+				menuToolButton.Clicked -= OnMenuToolButtonClicked;
+				menuToolButton.ShowMenu -= OnMenuItemActivated;
+			}
 		}
 
 		public override void OnNoteOpened ()