X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FToolbar.cc;h=a1a6e118269ad96182dd8b5885c913bffdcfab53;hb=733b4f4a3366eca53dc68fd40069b673b0261c96;hp=a2c3442b65562d72438b79bae39808989f396d5d;hpb=1525520dd177f7274ac5e2d2e95c5fa9027e0f48;p=chaz%2Fopenbox

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index a2c3442b..a1a6e118 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -916,13 +916,9 @@ void Toolbar::keyPressEvent(const XKeyEvent *ke) {
         blackbox->setFocusedWindow(0);
       }
 
-      Workspace *wkspc = screen->getCurrentWorkspace();
-      wkspc->setName(new_workspace_name);
-      wkspc->getMenu()->hide();
-
-      screen->getWorkspacemenu()->changeItemLabel(wkspc->getID() + 2,
-                                                  wkspc->getName());
-      screen->getWorkspacemenu()->update();
+      // the toolbar will be reconfigured when the change to the workspace name
+      // gets caught in the PropertyNotify event handler
+      screen->getCurrentWorkspace()->setName(new_workspace_name);
 
       new_workspace_name.erase();
       new_name_pos = 0;
@@ -938,7 +934,6 @@ void Toolbar::keyPressEvent(const XKeyEvent *ke) {
       else
         XSetWindowBackgroundPixmap(display, frame.workspace_label,
                                    frame.wlabel);
-      reconfigure();
     } else if (! (ks == XK_Shift_L || ks == XK_Shift_R ||
                   ks == XK_Control_L || ks == XK_Control_R ||
                   ks == XK_Caps_Lock || ks == XK_Shift_Lock ||