From 09a1df0e7b1ab0916c1437d46b10fcff948e5e81 Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Wed, 16 Apr 2003 22:50:55 +0000
Subject: [PATCH] Don't freak out if we are deactivated multiple times.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@1100 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 .../java/com/samskivert/swing/RadialMenu.java | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/projects/samskivert/src/java/com/samskivert/swing/RadialMenu.java b/projects/samskivert/src/java/com/samskivert/swing/RadialMenu.java
index 724305c7..034091c9 100644
--- a/projects/samskivert/src/java/com/samskivert/swing/RadialMenu.java
+++ b/projects/samskivert/src/java/com/samskivert/swing/RadialMenu.java
@@ -1,5 +1,5 @@
 //
-// $Id: RadialMenu.java,v 1.2 2003/04/15 20:54:34 mdb Exp $
+// $Id: RadialMenu.java,v 1.3 2003/04/16 22:50:55 mdb Exp $
 
 package com.samskivert.swing;
 
@@ -267,21 +267,24 @@ public class RadialMenu
      */
     public void deactivate ()
     {
-        Component comp = _host.getComponent();
+        if (_host != null) {
+            // unwire ourselves from the host component
+            Component comp = _host.getComponent();
+            comp.removeMouseListener(this);
+            comp.removeMouseMotionListener(this);
 
-        // unwire ourselves from the host component
-        comp.removeMouseListener(this);
-        comp.removeMouseMotionListener(this);
+            // reinstate the previous mouse listeners
+            if (_hijacker != null) {
+                _hijacker.release();
+                _hijacker = null;
+            }
 
-        // reinstate the previous mouse listeners
-        _hijacker.release();
-        _hijacker = null;
+            // tell our host that we are no longer
+            _host.menuDeactivated(this);
 
-        // tell our host that we are no longer
-        _host.menuDeactivated(this);
-
-        // fire off a last repaint to clean up after ourselves
-        repaint();
+            // fire off a last repaint to clean up after ourselves
+            repaint();
+        }
 
         // clear out our references
         _host = null;