From 9e7cb046b3ab3fe9a0a6a670f6ffdcfb0ac75217 Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Sun, 27 Dec 2020 23:46:15 +0300
Subject: move cfo populate func.

---
 src/core/Frontend.cpp | 6 ------
 src/core/Game.cpp     | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 1e4d5d36..f803557f 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -3080,12 +3080,6 @@ CMenuManager::LoadSettings()
 		strcpy(m_aSkinName, DEFAULT_SKIN_NAME);
 	}
 	
-#ifdef CUSTOM_FRONTEND_OPTIONS
-		// Apparently this func. can be run multiple times at the start.
-		if (numCustomFrontendOptions == 0 && numCustomFrontendScreens == 0) {
-			CustomFrontendOptionsPopulate();
-		}
-#endif
 #ifdef LOAD_INI_SETTINGS
 	LoadINISettings(); // needs frontend options to be loaded
 #endif
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 630bbd07..b6ef7635 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -32,6 +32,7 @@
 #include "Fluff.h"
 #include "Font.h"
 #include "Frontend.h"
+#include "frontendoption.h"
 #include "GameLogic.h"
 #include "Garages.h"
 #include "GenericGameStorage.h"
@@ -167,6 +168,11 @@ CGame::InitialiseOnceBeforeRW(void)
 	debug("size of dummy %d\n", sizeof(CDummy));
 #ifdef EXTENDED_COLOURFILTER
 	CPostFX::InitOnce();
+#endif
+#ifdef CUSTOM_FRONTEND_OPTIONS
+	// Not needed here but may be needed in future
+	// if (numCustomFrontendOptions == 0 && numCustomFrontendScreens == 0)
+	CustomFrontendOptionsPopulate();
 #endif
 	return true;
 }
-- 
cgit v1.2.3