summaryrefslogtreecommitdiff
path: root/src/android/app
diff options
context:
space:
mode:
authorGravatar FearlessTobi2024-02-19 16:00:46 +0100
committerGravatar FearlessTobi2024-02-19 16:00:46 +0100
commit310c1f50beb77fc5c6f9075029973161d4e51a4a (patch)
tree43a5699123e4930560fc5016faac7efb15b63f4e /src/android/app
parentcore/CMakeLists: Sort alphabetically (diff)
downloadyuzu-310c1f50beb77fc5c6f9075029973161d4e51a4a.tar.gz
yuzu-310c1f50beb77fc5c6f9075029973161d4e51a4a.tar.xz
yuzu-310c1f50beb77fc5c6f9075029973161d4e51a4a.zip
scope_exit: Make constexpr
Allows the use of the macro in constexpr-contexts. Also avoids some potential problems when nesting braces inside it.
Diffstat (limited to 'src/android/app')
-rw-r--r--src/android/app/src/main/jni/native.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp
index 50cef5d2a..4ea82e217 100644
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -404,7 +404,9 @@ static Core::SystemResultStatus RunEmulation(const std::string& filepath,
404 const size_t program_index, 404 const size_t program_index,
405 const bool frontend_initiated) { 405 const bool frontend_initiated) {
406 MicroProfileOnThreadCreate("EmuThread"); 406 MicroProfileOnThreadCreate("EmuThread");
407 SCOPE_EXIT({ MicroProfileShutdown(); }); 407 SCOPE_EXIT {
408 MicroProfileShutdown();
409 };
408 410
409 LOG_INFO(Frontend, "starting"); 411 LOG_INFO(Frontend, "starting");
410 412
@@ -413,7 +415,9 @@ static Core::SystemResultStatus RunEmulation(const std::string& filepath,
413 return Core::SystemResultStatus::ErrorLoader; 415 return Core::SystemResultStatus::ErrorLoader;
414 } 416 }
415 417
416 SCOPE_EXIT({ EmulationSession::GetInstance().ShutdownEmulation(); }); 418 SCOPE_EXIT {
419 EmulationSession::GetInstance().ShutdownEmulation();
420 };
417 421
418 jconst result = EmulationSession::GetInstance().InitializeEmulation(filepath, program_index, 422 jconst result = EmulationSession::GetInstance().InitializeEmulation(filepath, program_index,
419 frontend_initiated); 423 frontend_initiated);