commit ac59b049229053a2e5ebb4911d2540a3f88ea6a8
Author: Juergen Spitzmueller <[email protected]>
Date: Fri Sep 8 17:47:47 2023 +0200
Only create a new view for lyxfiles-open if no view is open (#12894)
---
src/frontends/qt/GuiApplication.cpp | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/src/frontends/qt/GuiApplication.cpp
b/src/frontends/qt/GuiApplication.cpp
index 57eaaf6..b7abd42 100644
--- a/src/frontends/qt/GuiApplication.cpp
+++ b/src/frontends/qt/GuiApplication.cpp
@@ -1901,12 +1901,6 @@ void GuiApplication::dispatch(FuncRequest const & cmd,
DispatchResult & dr)
}
case LFUN_LYXFILES_OPEN: {
- // This is the actual reason for this method (#12106).
- validateCurrentView();
- if (!current_view_
- || (!lyxrc.open_buffers_in_tabs
- && current_view_->documentBufferView() != nullptr))
- createView();
string arg = to_utf8(cmd.argument());
if (arg.empty())
// set default
@@ -2263,17 +2257,15 @@ void GuiApplication::dispatch(FuncRequest const & cmd,
DispatchResult & dr)
case LFUN_DIALOG_SHOW: {
string const name = cmd.getArg(0);
-
- if ( name == "aboutlyx"
- || name == "prefs"
- || name == "texinfo"
- || name == "progress"
- || name == "compare")
+ // Workaround: on Mac OS the application
+ // is not terminated when closing the last view.
+ // With the following dialogs which should still
+ // be usable, create a new one to be able
+ // to dispatch LFUN_DIALOG_SHOW to this view.
+ if (name == "aboutlyx" || name == "compare"
+ || name == "lyxfiles" || name == "prefs"
+ || name == "progress" || name == "texinfo")
{
- // work around: on Mac OS the application
- // is not terminated when closing the last view.
- // Create a new one to be able to dispatch the
- // LFUN_DIALOG_SHOW to this view.
if (current_view_ == nullptr)
createView();
}
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
