Merge pull request #13248 from iota97/ui-sound-fix

UI sound fix
hrydgard · Aug 4, 2020 · 736ad92 · 736ad92
2 parents 9f147e8 + c392d95
commit 736ad92
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2037,6 +2037,11 @@ set(NativeAssets
 	assets/rargray.png
 	assets/unknown.png
 	assets/zip.png
+	assets/sfx_back.wav
+	assets/sfx_confirm.wav
+	assets/sfx_select.wav
+	assets/sfx_toggle_off.wav
+	assets/sfx_toggle_on.wav
 	source_assets/image/logo.png
 	source_assets/image/icon_regular_72.png
 )

diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
@@ -446,9 +446,6 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
 
 	g_Discord.SetPresenceMenu();
 
-	// TODO: Load these in the background instead of synchronously.
-	g_BackgroundAudio.LoadSamples();
-
 	// Make sure UI state is MENU.
 	ResetUIState();
 
@@ -710,6 +707,9 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
 	}
 #endif
 
+	// TODO: Load these in the background instead of synchronously.
+	g_BackgroundAudio.LoadSamples();
+
 	if (!boot_filename.empty() && stateToLoad != NULL) {
 		SaveState::Load(stateToLoad, -1, [](SaveState::Status status, const std::string &message, void *) {
 			if (!message.empty() && (!g_Config.bDumpFrames || !g_Config.bDumpVideoOutput)) {