X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-menu.el;h=4023b7d3a0e253fc0bb00207ce1aef2dfaf6c889;hb=91839c2c2836c9e81e73ade8184d07fb1ee97fc2;hp=180792d7125d86b2943bc5f1a4c0137b7222c049;hpb=304137c7e1c9d46c677d5d54267e154c679d2ecc;p=riece

diff --git a/lisp/riece-menu.el b/lisp/riece-menu.el
index 180792d..4023b7d 100644
--- a/lisp/riece-menu.el
+++ b/lisp/riece-menu.el
@@ -111,14 +111,18 @@
   (easy-menu-add riece-menu))
 
 (defun riece-menu-insinuate ()
+  (if riece-command-buffer
+      (with-current-buffer riece-command-buffer
+	(riece-menu-command-mode-hook)))
   (add-hook 'riece-command-mode-hook
 	    'riece-menu-command-mode-hook))
 
 (defun riece-menu-uninstall ()
+  (if riece-command-buffer
+      (with-current-buffer riece-command-buffer
+	(easy-menu-remove riece-menu)))
   (remove-hook 'riece-command-mode-hook
-	       'riece-menu-command-mode-hook)
-  (with-current-buffer riece-command-buffer
-    (easy-menu-remove riece-menu)))
+	       'riece-menu-command-mode-hook))
 
 (provide 'riece-menu)