X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-toolbar.el;h=4bcec8a5b26dbf87b2a3c381a203dbcd9e1c4f9c;hb=c70715e3dbe2d42b59e7048449a28851880f56e4;hp=fdad3708fa3141fa65709a6fc484dec30aa4f71d;hpb=b1532be62045dfee86d080aeaa4e43e0b7f52fad;p=riece

diff --git a/lisp/riece-toolbar.el b/lisp/riece-toolbar.el
index fdad370..4bcec8a 100644
--- a/lisp/riece-toolbar.el
+++ b/lisp/riece-toolbar.el
@@ -121,15 +121,18 @@
   '(riece-menu))
 
 (defun riece-toolbar-insinuate ()
+  (if riece-command-buffer
+      (with-current-buffer riece-command-buffer
+	(riece-toolbar-command-mode-hook)))
   (add-hook 'riece-command-mode-hook
-	    'riece-toolbar-command-mode-hook
-	    t))
+	    'riece-toolbar-command-mode-hook t))
 
 (defun riece-toolbar-uninstall ()
+  (if riece-command-buffer
+      (with-current-buffer riece-command-buffer
+	(riece-unset-toolbar)))
   (remove-hook 'riece-command-mode-hook
-	       'riece-toolbar-command-mode-hook)
-  (with-current-buffer riece-command-buffer
-    (riece-unset-toolbar)))
+	       'riece-toolbar-command-mode-hook))
 
 (provide 'riece-toolbar)