* only autoclose GuiView on last removed tab if the tab mode is not enabled.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23736 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index e078a7f0f8c64ae82e291c58f3537441efafc878..457ce8c0149eedff3ae9def1cc470826da779c76 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -161,9 +161,9 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
        QCoreApplication::setOrganizationDomain("lyx.org");
        QCoreApplication::setApplicationName(app_name + "-" + lyx_version);
 
-       //FIXME: quitOnLastWindowClosed is true by default, at least on Windows and
-       // X11 platforms. We should have a lyxrc setting for this in order to let the
-       // application stay resident.
+       // FIXME: quitOnLastWindowClosed is true by default. We should have a
+       // lyxrc setting for this in order to let the application stay resident.
+       // But then we need some kind of dock icon, at least on Windows.
        /*
        if (lyxrc.quit_on_last_window_closed)
                setQuitOnLastWindowClosed(false);

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index c1e05864bcb0a6a330e74cbf63f785e0d73fc9b1..84a92d9f9ed1b3499865e2dd4a7bcd73443fbeb1 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -543,7 +543,7 @@ void GuiView::on_lastWorkAreaRemoved()
 #ifdef Q_WS_MAC
        // On Mac close the view if there is no Tab open anymore,
        // but only if no splitter is visible
-       if (d.splitter_->count() == 1) {
+       if (!lyxrc.single_window && d.splitter_->count() == 1) {
                TabWorkArea * twa = qobject_cast<TabWorkArea *>(d.splitter_->widget(0));
                if (twa && twa->count() == 0) {
                        // close the view, as no tab is open anymore