From ec0fef8b132503314eb76aee5aa6057c62433591 Mon Sep 17 00:00:00 2001 From: Ingo Date: Tue, 4 Nov 2014 21:12:34 +0100 Subject: [PATCH] Stay at queue panel when queue panel was active while closing an editor panel --- rtgui/rtwindow.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index f1fc8a050..21c732437 100644 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -436,6 +436,7 @@ void RTWindow::remEditorPanel (EditorPanel* ep) { EditWindow * wndEdit = EditWindow::getInstance(this); wndEdit->remEditorPanel(ep); } else { + bool queueHadFocus = (mainNB->get_current_page() == mainNB->page_num (*bpanel)); epanels.erase (ep->getFileName()); filesEdited.erase (ep->getFileName ()); fpanel->refreshEditedState (filesEdited); @@ -443,7 +444,8 @@ void RTWindow::remEditorPanel (EditorPanel* ep) { mainNB->remove_page (*ep); if (!isEditorPanel(mainNB->get_current_page())){ - mainNB->set_current_page (mainNB->page_num (*fpanel)); + if(!queueHadFocus) + mainNB->set_current_page (mainNB->page_num (*fpanel)); set_title_decorated(""); } else { EditorPanel* ep = static_cast(mainNB->get_nth_page (mainNB->get_current_page()));