From: Stephan Witt <switt@lyx.org>
Date: Sat, 23 Oct 2021 11:34:18 +0000 (+0200)
Subject: #12201 force open document in tabs on Mac when user preference is Always
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=436620a881dd85141d89bd3c26c462056b4d9c2a;p=features.git

#12201 force open document in tabs on Mac when user preference is Always
---

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 6bc28e960a..62673f4a69 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -286,10 +286,6 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 	// format prior to 2.0 and introduction of format tag
 	unsigned int rc_format = 0;
 
-#ifdef USE_MACOSX_PACKAGING
-	open_buffers_in_tabs = appleUserTabbingPreferenceAlways();
-#endif
-
 	while (lexrc.isOK()) {
 		// By using two switches we take advantage of the compiler
 		// telling us if we have missed a LyXRCTags element in
@@ -1064,6 +1060,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
 			break;
 		case RC_OPEN_BUFFERS_IN_TABS:
 			lexrc >> open_buffers_in_tabs;
+#ifdef USE_MACOSX_PACKAGING
+			if (appleUserTabbingPreferenceAlways())
+				open_buffers_in_tabs = true;
+#endif
 			break;
 		case RC_SINGLE_CLOSE_TAB_BUTTON:
 			lexrc >> single_close_tab_button;