From 38a1fef5c1e22c58ae4dd316800a162b04e22aad Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Sun, 27 Dec 2020 23:46:15 +0300
Subject: [PATCH] move cfo populate func.
---
src/core/Frontend.cpp | 8 +-------
src/core/Game.cpp | 6 ++++++
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 72739f7b..13fb1add 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -3744,13 +3744,7 @@ CMenuManager::LoadSettings()
strcpy(m_PrefsSkinFile, DEFAULT_SKIN_NAME);
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 126f0341..ff87b95a 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)
ValidateVersion();
#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;
}