aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index abe43d2..2cb599b 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -679,13 +679,12 @@ void Fluxbox::handleEvent(XEvent * const e) {
679 FbTk::Menu::focused()->window() == e->xfocus.window) { 679 FbTk::Menu::focused()->window() == e->xfocus.window) {
680 680
681 // find screen num 681 // find screen num
682 BScreen *screen = 0;
683 ScreenList::iterator it = m_screen_list.begin(); 682 ScreenList::iterator it = m_screen_list.begin();
684 ScreenList::iterator it_end = m_screen_list.end(); 683 ScreenList::iterator it_end = m_screen_list.end();
685 for (; it != it_end; ++it) { 684 for (; it != it_end; ++it) {
686 if ( (*it)->screenNumber() == 685 if ( (*it)->screenNumber() ==
687 FbTk::Menu::focused()->fbwindow().screenNumber()) { 686 FbTk::Menu::focused()->fbwindow().screenNumber()) {
688 screen = (*it); 687 FocusControl::revertFocus(**it);
689 break; // found the screen, no more search 688 break; // found the screen, no more search
690 } 689 }
691 } 690 }
@@ -1786,7 +1785,8 @@ void Fluxbox::timed_reconfigure() {
1786} 1785}
1787 1786
1788void Fluxbox::revert_focus() { 1787void Fluxbox::revert_focus() {
1789 if (m_revert_screen && !FocusControl::focusedWindow()) 1788 if (m_revert_screen && !FocusControl::focusedWindow() &&
1789 !FbTk::Menu::focused())
1790 FocusControl::revertFocus(*m_revert_screen); 1790 FocusControl::revertFocus(*m_revert_screen);
1791} 1791}
1792 1792