Loader : Deduplicate code via new CreateSettings()

src/core/kernel/init/CxbxKrnl.cpp

@@ -872,13 +872,8 @@ void ImportLibraries(XbeImportEntry *pImportDirectory)
 	}
 }
 
-bool HandleFirstLaunch()
+bool CreateSettings()
 {
-	bool bFirstLaunch;
-	g_EmuShared->GetIsFirstLaunch(&bFirstLaunch);
-
-	/* check if process is launch with elevated access then prompt for continue on or not. */
-	if (!bFirstLaunch) {
 	g_Settings = new Settings();
 	if (g_Settings == nullptr) {
 		MessageBox(nullptr, szSettings_alloc_error, "Cxbx-Reloaded", MB_OK);
@@ -890,6 +885,19 @@ bool HandleFirstLaunch()
 	}
 
 	log_get_settings();
+	return true;
+}
+
+bool HandleFirstLaunch()
+{
+	bool bFirstLaunch;
+	g_EmuShared->GetIsFirstLaunch(&bFirstLaunch);
+
+	/* check if process is launch with elevated access then prompt for continue on or not. */
+	if (!bFirstLaunch) {
+		if (!CreateSettings()) {
+			return false;
+		}
 
 		bool bElevated = CxbxIsElevated();
 		if (bElevated && !g_Settings->m_core.allowAdminPrivilege) {

src/core/kernel/init/CxbxKrnl.h

@@ -224,6 +224,8 @@ bool CxbxKrnlVerifyVersion(const char *szVersion);
 
 extern bool g_bIsDebugKernel;
 
+bool CreateSettings();
+
 bool HandleFirstLaunch();
 
 /*! Cxbx Kernel Entry Point */

src/gui/WinMain.cpp

@@ -99,19 +99,10 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 
 	// If 2nd GUI executable is launched, load settings file for GUI for editable support.
 	if (g_Settings == nullptr) {
-		g_Settings = new Settings();
+		if (!CreateSettings()) {
-		if (g_Settings == nullptr) {
-			MessageBox(nullptr, szSettings_alloc_error, "Cxbx-Reloaded", MB_OK);
 			EmuShared::Cleanup();
 			return EXIT_FAILURE;
 		}
-
-		if (!g_Settings->Init()) {
-			EmuShared::Cleanup();
-			return EXIT_FAILURE;
-		}
-
-		log_get_settings();
 	}
 
 	// Possible optional output for GUI