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

UI sound fix
This commit is contained in:
Unknown W. Brackets authored and GitHub committed 2020-08-04 19:03:26 -04:00
commit 736ad920c4
2 files changed
+8 -3

No files matched your search

+5
View File
@@ -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
)
+3 -3
View File
@@ -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)) {