diff options
author | fluxgen <fluxgen> | 2002-02-27 22:04:01 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-02-27 22:04:01 (GMT) |
commit | 0cba1e7dffae670d1a4bbaa6fb300d6888f1e7ce (patch) | |
tree | 9c3da81fc3179b990a2ca26bb4dd548e08fdb157 /src/fluxbox.cc | |
parent | 64faaa975e4df02bbf49bc19a96e25e6bc191f3e (diff) | |
download | fluxbox-0cba1e7dffae670d1a4bbaa6fb300d6888f1e7ce.zip fluxbox-0cba1e7dffae670d1a4bbaa6fb300d6888f1e7ce.tar.bz2 |
fixed the focusbug when deleting a window which calls Fluxbox::setFocusedWindow and the calls FluxboxWindow::setFocusFlag on the same window
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index fbeb860..c2b616c 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.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: fluxbox.cc,v 1.36 2002/02/26 22:42:23 fluxgen Exp $ | 25 | // $Id: fluxbox.cc,v 1.37 2002/02/27 22:04:01 fluxgen Exp $ |
26 | 26 | ||
27 | //Use some GNU extensions | 27 | //Use some GNU extensions |
28 | #ifndef _GNU_SOURCE | 28 | #ifndef _GNU_SOURCE |
@@ -2475,7 +2475,7 @@ void Fluxbox::setFocusedWindow(FluxboxWindow *win) { | |||
2475 | Toolbar *old_tbar = 0, *tbar = 0; | 2475 | Toolbar *old_tbar = 0, *tbar = 0; |
2476 | Workspace *old_wkspc = 0, *wkspc = 0; | 2476 | Workspace *old_wkspc = 0, *wkspc = 0; |
2477 | 2477 | ||
2478 | if (focused_window) { | 2478 | if (focused_window!=0) { |
2479 | old_win = focused_window; | 2479 | old_win = focused_window; |
2480 | old_screen = old_win->getScreen(); | 2480 | old_screen = old_win->getScreen(); |
2481 | 2481 | ||
@@ -2499,9 +2499,9 @@ void Fluxbox::setFocusedWindow(FluxboxWindow *win) { | |||
2499 | } else | 2499 | } else |
2500 | focused_window = (FluxboxWindow *) 0; | 2500 | focused_window = (FluxboxWindow *) 0; |
2501 | 2501 | ||
2502 | if (tbar) | 2502 | if (tbar!=0) |
2503 | tbar->redrawWindowLabel(True); | 2503 | tbar->redrawWindowLabel(True); |
2504 | if (screen) | 2504 | if (screen!=0) |
2505 | screen->updateNetizenWindowFocus(); | 2505 | screen->updateNetizenWindowFocus(); |
2506 | 2506 | ||
2507 | if (old_tbar && old_tbar != tbar) | 2507 | if (old_tbar && old_tbar != tbar) |