From f4b471d000e8c663be5954ea97f3451fd3a1d287 Mon Sep 17 00:00:00 2001
From: "Herman S." <429230+has207@users.noreply.github.com>
Date: Tue, 21 Oct 2025 10:54:12 +0900
Subject: [PATCH] [App] ensure InitFeatureFlags is called after cvar parsing

Fixes x64_exension_mask being applied
---
 src/xenia/app/xenia_main.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/xenia/app/xenia_main.cc b/src/xenia/app/xenia_main.cc
index d6662e0b9..b70ba2d7c 100644
--- a/src/xenia/app/xenia_main.cc
+++ b/src/xenia/app/xenia_main.cc
@@ -444,9 +444,6 @@ std::vector<std::unique_ptr<hid::InputDriver>> EmulatorApp::CreateInputDrivers(
 }
 
 bool EmulatorApp::OnInitialize() {
-#if XE_ARCH_AMD64 == 1
-  amd64::InitFeatureFlags();
-#endif
   Profiler::Initialize();
   Profiler::ThreadEnter("Main");
 
@@ -472,6 +469,10 @@ bool EmulatorApp::OnInitialize() {
 
   config::SetupConfig(storage_root);
 
+#if XE_ARCH_AMD64 == 1
+  amd64::InitFeatureFlags();
+#endif
+
   std::filesystem::path content_root = cvars::content_root;
   if (content_root.empty()) {
     content_root = storage_root / "content";