diff options
author | markt <markt> | 2007-11-08 18:35:57 (GMT) |
---|---|---|
committer | markt <markt> | 2007-11-08 18:35:57 (GMT) |
commit | 8d4a6d5181aff0f0ca87b9709da7b4fba842f30e (patch) | |
tree | 4157b883e4a35c01960b2de4803555478282cc3e /src/FocusControl.cc | |
parent | 5db87437e6d1cb4c5bf6f3500c3f650b6b664ed1 (diff) | |
download | fluxbox-8d4a6d5181aff0f0ca87b9709da7b4fba842f30e.zip fluxbox-8d4a6d5181aff0f0ca87b9709da7b4fba842f30e.tar.bz2 |
one more fix
Diffstat (limited to 'src/FocusControl.cc')
-rw-r--r-- | src/FocusControl.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/FocusControl.cc b/src/FocusControl.cc index 8e6b895..7bc1db4 100644 --- a/src/FocusControl.cc +++ b/src/FocusControl.cc | |||
@@ -435,31 +435,31 @@ void FocusControl::removeClient(WinClient &client) { | |||
435 | if (client.screen().isShuttingdown()) | 435 | if (client.screen().isShuttingdown()) |
436 | return; | 436 | return; |
437 | 437 | ||
438 | m_focused_list.remove(&client); | ||
439 | m_creation_order_list.remove(&client); | ||
440 | client.screen().clientListSig().notify(); | ||
441 | |||
442 | if (m_cycling_list && m_cycling_window != m_cycling_list->end() && | 438 | if (m_cycling_list && m_cycling_window != m_cycling_list->end() && |
443 | *m_cycling_window == &client) { | 439 | *m_cycling_window == &client) { |
444 | m_cycling_window = m_cycling_list->end(); | 440 | m_cycling_window = m_cycling_list->end(); |
445 | stopCyclingFocus(); | 441 | stopCyclingFocus(); |
446 | } else if (m_cycling_last == &client) | 442 | } else if (m_cycling_last == &client) |
447 | m_cycling_last = 0; | 443 | m_cycling_last = 0; |
444 | |||
445 | m_focused_list.remove(&client); | ||
446 | m_creation_order_list.remove(&client); | ||
447 | client.screen().clientListSig().notify(); | ||
448 | } | 448 | } |
449 | 449 | ||
450 | void FocusControl::removeWindow(Focusable &win) { | 450 | void FocusControl::removeWindow(Focusable &win) { |
451 | if (win.screen().isShuttingdown()) | 451 | if (win.screen().isShuttingdown()) |
452 | return; | 452 | return; |
453 | 453 | ||
454 | m_focused_win_list.remove(&win); | ||
455 | m_creation_order_win_list.remove(&win); | ||
456 | win.screen().clientListSig().notify(); | ||
457 | |||
458 | if (m_cycling_list && m_cycling_window != m_cycling_list->end() && | 454 | if (m_cycling_list && m_cycling_window != m_cycling_list->end() && |
459 | *m_cycling_window == &win) { | 455 | *m_cycling_window == &win) { |
460 | m_cycling_window = m_cycling_list->end(); | 456 | m_cycling_window = m_cycling_list->end(); |
461 | stopCyclingFocus(); | 457 | stopCyclingFocus(); |
462 | } | 458 | } |
459 | |||
460 | m_focused_win_list.remove(&win); | ||
461 | m_creation_order_win_list.remove(&win); | ||
462 | win.screen().clientListSig().notify(); | ||
463 | } | 463 | } |
464 | 464 | ||
465 | void FocusControl::shutdown() { | 465 | void FocusControl::shutdown() { |