summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2002-09-14 10:58:25 (GMT)
committerrathnor <rathnor>2002-09-14 10:58:25 (GMT)
commit5512cac1b62e233a6edc9a7bd87d32deaeda9612 (patch)
tree14db43c759a5e1a51910dde249e24a5da3790694
parente54676573689d353bf53a4d6225ba1206ddf10fa (diff)
downloadfluxbox_lack-5512cac1b62e233a6edc9a7bd87d32deaeda9612.zip
fluxbox_lack-5512cac1b62e233a6edc9a7bd87d32deaeda9612.tar.bz2
fix for when a window doesn't have a menu (decorations.menu == 0)
-rw-r--r--src/Toolbar.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 81bb0ff..aa8796f 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.31 2002/09/08 19:43:15 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.32 2002/09/14 10:58:25 rathnor Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -1032,7 +1032,8 @@ void Toolbar::buttonPressEvent(XButtonEvent *be) {
1032 FluxboxWindow *fluxboxwin = 0; 1032 FluxboxWindow *fluxboxwin = 0;
1033 if ( iconbar && (fluxboxwin = iconbar->findWindow(be->window)) ) { 1033 if ( iconbar && (fluxboxwin = iconbar->findWindow(be->window)) ) {
1034 Windowmenu *wm = fluxboxwin->getWindowmenu(); 1034 Windowmenu *wm = fluxboxwin->getWindowmenu();
1035 fluxboxwin->showMenu(be->x_root, be->y_root - wm->height()); 1035 if (wm)
1036 fluxboxwin->showMenu(be->x_root, be->y_root - wm->height());
1036 } else if (! toolbarmenu->isVisible()) { 1037 } else if (! toolbarmenu->isVisible()) {
1037 int x, y; 1038 int x, y;
1038 1039