From e4425690b1d0dd6721cbe9050e09e25f5a66214f Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Tue, 24 Sep 2019 10:32:13 +0200
Subject: [PATCH] + chg: (internal) load Flags (Settings2) as part of
 LoadSettings() - one pass .ini-read

---
 src/Config/Config.cpp | 110 ++++++++++++++++++------------------------
 src/Config/Config.h   |   1 -
 src/Notepad3.c        |   4 +-
 3 files changed, 49 insertions(+), 66 deletions(-)

diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp
index d48ebba26..c8940b32a 100644
--- a/src/Config/Config.cpp
+++ b/src/Config/Config.cpp
@@ -615,6 +615,54 @@ void LoadSettings()
   // --------------------------------------------------------------------------
   const WCHAR* const Settings2_Section = L"Settings2";
 
+  Flags.bDevDebugMode = IniSectionGetBool(Settings2_Section, L"DevDebugMode", DefaultFlags.bDevDebugMode);
+  Flags.bStickyWindowPosition = IniSectionGetBool(Settings2_Section, L"StickyWindowPosition", DefaultFlags.bStickyWindowPosition);
+
+  if (s_flagReuseWindow == 0) {
+    Flags.bReuseWindow = IniSectionGetBool(Settings2_Section, L"ReuseWindow", DefaultFlags.bReuseWindow);
+  }
+  else {
+    Flags.bReuseWindow = (s_flagReuseWindow == 2);
+  }
+
+  if (s_flagSingleFileInstance == 0) {
+    Flags.bSingleFileInstance = IniSectionGetBool(Settings2_Section, L"SingleFileInstance", DefaultFlags.bSingleFileInstance);
+  }
+  else {
+    Flags.bSingleFileInstance = (s_flagSingleFileInstance == 2);
+  }
+
+  if (s_flagMultiFileArg == 0) {
+    Flags.MultiFileArg = IniSectionGetBool(Settings2_Section, L"MultiFileArg", DefaultFlags.MultiFileArg);
+  }
+  else {
+    Flags.MultiFileArg = (s_flagMultiFileArg == 2);
+  }
+
+  if (s_flagShellUseSystemMRU == 0) {
+    Flags.ShellUseSystemMRU = IniSectionGetBool(Settings2_Section, L"ShellUseSystemMRU", DefaultFlags.ShellUseSystemMRU);
+  }
+  else {
+    Flags.ShellUseSystemMRU = (s_flagShellUseSystemMRU == 2);
+  }
+
+  Flags.RelativeFileMRU = IniSectionGetBool(Settings2_Section, L"RelativeFileMRU", DefaultFlags.RelativeFileMRU);
+  Flags.PortableMyDocs = IniSectionGetBool(Settings2_Section, L"PortableMyDocs", DefaultFlags.PortableMyDocs);
+  Flags.NoFadeHidden = IniSectionGetBool(Settings2_Section, L"NoFadeHidden", DefaultFlags.NoFadeHidden);
+
+  Flags.ToolbarLook = IniSectionGetInt(Settings2_Section, L"ToolbarLook", DefaultFlags.ToolbarLook);
+  Flags.ToolbarLook = clampi(Flags.ToolbarLook, 0, 2);
+
+  Flags.SimpleIndentGuides = IniSectionGetBool(Settings2_Section, L"SimpleIndentGuides", DefaultFlags.SimpleIndentGuides);
+  Flags.NoHTMLGuess = IniSectionGetBool(Settings2_Section, L"NoHTMLGuess", DefaultFlags.NoHTMLGuess);
+  Flags.NoCGIGuess = IniSectionGetBool(Settings2_Section, L"NoCGIGuess", DefaultFlags.NoCGIGuess);
+  Flags.NoFileVariables = IniSectionGetInt(Settings2_Section, L"NoFileVariables", DefaultFlags.NoFileVariables);
+
+  Flags.PrintFileAndLeave = s_flagPrintFileAndLeave;
+  Flags.bPreserveFileModTime = false;
+
+  // --------------------------------------------------------------------------
+
   Defaults2.PreferredLanguageLocaleName[0] = L'\0';
   IniSectionGetString(Settings2_Section, L"PreferredLanguageLocaleName", Defaults2.PreferredLanguageLocaleName,
     Settings2.PreferredLanguageLocaleName, COUNTOF(Settings2.PreferredLanguageLocaleName));
@@ -1145,68 +1193,6 @@ void LoadSettings()
 
 
 
-//=============================================================================
-//
-//  LoadFlags()
-//
-//
-void LoadFlags()
-{
-  LoadIniFile(Globals.IniFile);
-
-  const WCHAR* const Settings2_Section = L"Settings2";
-
-  Flags.bDevDebugMode = IniSectionGetBool(Settings2_Section, L"DevDebugMode", DefaultFlags.bDevDebugMode);
-  Flags.bStickyWindowPosition = IniSectionGetBool(Settings2_Section, L"StickyWindowPosition", DefaultFlags.bStickyWindowPosition);
-
-  if (s_flagReuseWindow == 0) {
-    Flags.bReuseWindow = IniSectionGetBool(Settings2_Section, L"ReuseWindow", DefaultFlags.bReuseWindow);
-  }
-  else {
-    Flags.bReuseWindow = (s_flagReuseWindow == 2);
-  }
-
-  if (s_flagSingleFileInstance == 0) {
-    Flags.bSingleFileInstance = IniSectionGetBool(Settings2_Section, L"SingleFileInstance", DefaultFlags.bSingleFileInstance);
-  }
-  else {
-    Flags.bSingleFileInstance = (s_flagSingleFileInstance == 2);
-  }
-
-  if (s_flagMultiFileArg == 0) {
-    Flags.MultiFileArg = IniSectionGetBool(Settings2_Section, L"MultiFileArg", DefaultFlags.MultiFileArg);
-  }
-  else {
-    Flags.MultiFileArg = (s_flagMultiFileArg == 2);
-  }
-
-  if (s_flagShellUseSystemMRU == 0) {
-    Flags.ShellUseSystemMRU = IniSectionGetBool(Settings2_Section, L"ShellUseSystemMRU", DefaultFlags.ShellUseSystemMRU);
-  }
-  else {
-    Flags.ShellUseSystemMRU = (s_flagShellUseSystemMRU == 2);
-  }
-
-  Flags.RelativeFileMRU = IniSectionGetBool(Settings2_Section, L"RelativeFileMRU", DefaultFlags.RelativeFileMRU);
-  Flags.PortableMyDocs = IniSectionGetBool(Settings2_Section, L"PortableMyDocs", DefaultFlags.PortableMyDocs);
-  Flags.NoFadeHidden = IniSectionGetBool(Settings2_Section, L"NoFadeHidden", DefaultFlags.NoFadeHidden);
-
-  Flags.ToolbarLook = IniSectionGetInt(Settings2_Section, L"ToolbarLook", DefaultFlags.ToolbarLook);
-  Flags.ToolbarLook = clampi(Flags.ToolbarLook, 0, 2);
-
-  Flags.SimpleIndentGuides = IniSectionGetBool(Settings2_Section, L"SimpleIndentGuides", DefaultFlags.SimpleIndentGuides);
-  Flags.NoHTMLGuess = IniSectionGetBool(Settings2_Section, L"NoHTMLGuess", DefaultFlags.NoHTMLGuess);
-  Flags.NoCGIGuess = IniSectionGetBool(Settings2_Section, L"NoCGIGuess", DefaultFlags.NoCGIGuess);
-  Flags.NoFileVariables = IniSectionGetInt(Settings2_Section, L"NoFileVariables", DefaultFlags.NoFileVariables);
-
-  Flags.PrintFileAndLeave = s_flagPrintFileAndLeave;
-  Flags.bPreserveFileModTime = false;
-
-  ReleaseIniFile();
-}
-
-
-
 //=============================================================================
 //
 //  OpenSettingsFile()
diff --git a/src/Config/Config.h b/src/Config/Config.h
index 92c499917..223705a65 100644
--- a/src/Config/Config.h
+++ b/src/Config/Config.h
@@ -31,7 +31,6 @@ bool CreateIniFile();
 bool CreateIniFileEx(LPCWSTR lpszIniFile);
 
 void LoadSettings();
-void LoadFlags();
 
 bool OpenSettingsFile();
 bool SaveSettings(bool);
diff --git a/src/Notepad3.c b/src/Notepad3.c
index ab1fcc7bb..004a230cd 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -817,7 +817,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
   FindIniFile();
   TestIniFile();
   CreateIniFile();
-  LoadFlags();
+  LoadSettings();
 
   // set AppUserModelID
   PrivateSetCurrentProcessExplicitAppUserModelID(Settings2.AppUserModelID);
@@ -852,8 +852,6 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
 
   Scintilla_RegisterClasses(hInstance);
 
-  LoadSettings();
-
   // ----------------------------------------------------
   // MultiLingual
   //