summaryrefslogtreecommitdiff
path: root/src/Toolbar.cc
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2002-05-13 23:09:20 +0000
committerDana Jansens <danakj@orodu.net>2002-05-13 23:09:20 +0000
commitd6c02ad70c42f074a4c3d8c433de5bb2c63dea8e (patch)
treeef3f577cbad046d8e35176cc14d0414cd80c8431 /src/Toolbar.cc
parentabfaee73685890cc0bb6185fc167dd19fcdfd7f2 (diff)
fix segfaut from uninitialized focused_screen pointer
Diffstat (limited to 'src/Toolbar.cc')
-rw-r--r--src/Toolbar.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 7ce387eb..d801cb4b 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -725,7 +725,9 @@ void Toolbar::checkClock(Bool redraw, Bool date) {
void Toolbar::redrawWindowLabel(Bool redraw) {
OpenboxWindow *foc = screen.getOpenbox().focusedWindow();
- if (foc != (OpenboxWindow *) 0) {
+ if (foc == (OpenboxWindow *) 0) {
+ XClearWindow(display, frame.window_label);
+ } else {
if (redraw)
XClearWindow(display, frame.window_label);
@@ -780,8 +782,6 @@ void Toolbar::redrawWindowLabel(Bool redraw) {
else
XDrawString(display, frame.window_label, style->w_text_gc, dx,
(style->font->ascent + 1), *foc->getTitle(), dlen);
- } else {
- XClearWindow(display, frame.window_label);
}
}