From 317e795d353f5f0f709a8b99f7f1d28d2820fa1d Mon Sep 17 00:00:00 2001 From: MerryMage Date: Tue, 15 Mar 2016 02:59:14 +0000 Subject: [PATCH] citra: Shutdown cleanly if ROM load fails --- src/citra/citra.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 415b98a05..40e40f192 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -19,6 +19,8 @@ #include "common/logging/log.h" #include "common/logging/backend.h" #include "common/logging/filter.h" +#include "common/make_unique.h" +#include "common/scope_exit.h" #include "core/settings.h" #include "core/system.h" @@ -64,6 +66,7 @@ int main(int argc, char **argv) { Log::SetFilter(&log_filter); MicroProfileOnThreadCreate("EmuThread"); + SCOPE_EXIT({ MicroProfileShutdown(); }); if (boot_filename.empty()) { LOG_CRITICAL(Frontend, "Failed to load ROM: No ROM specified"); @@ -76,12 +79,13 @@ int main(int argc, char **argv) { GDBStub::ToggleServer(Settings::values.use_gdbstub); GDBStub::SetServerPort(static_cast(Settings::values.gdbstub_port)); - EmuWindow_SDL2* emu_window = new EmuWindow_SDL2; + std::unique_ptr emu_window = Common::make_unique(); VideoCore::g_hw_renderer_enabled = Settings::values.use_hw_renderer; VideoCore::g_shader_jit_enabled = Settings::values.use_shader_jit; - System::Init(emu_window); + System::Init(emu_window.get()); + SCOPE_EXIT({ System::Shutdown(); }); Loader::ResultStatus load_result = Loader::LoadFile(boot_filename); if (Loader::ResultStatus::Success != load_result) { @@ -93,11 +97,5 @@ int main(int argc, char **argv) { Core::RunLoop(); } - System::Shutdown(); - - delete emu_window; - - MicroProfileShutdown(); - return 0; }