From 15ce3b194d6c4305d484c74bf209bbcba52393a8 Mon Sep 17 00:00:00 2001 From: Mr-Wiseguy Date: Sun, 7 Jan 2024 23:46:44 -0500 Subject: [PATCH] Hooked up exit button in launcher and updated RT64 to fix issue with the launcher not closing --- assets/launcher.rml | 2 +- lib/RT64-HLE | 2 +- src/ui/ui_launcher.cpp | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/assets/launcher.rml b/assets/launcher.rml index 70b3f09..75ed030 100644 --- a/assets/launcher.rml +++ b/assets/launcher.rml @@ -44,7 +44,7 @@ - diff --git a/lib/RT64-HLE b/lib/RT64-HLE index a9a74b5..c4e3c89 160000 --- a/lib/RT64-HLE +++ b/lib/RT64-HLE @@ -1 +1 @@ -Subproject commit a9a74b5c1975e081bc0a23f29545a0954f5a2f90 +Subproject commit c4e3c89fe5c1d51caa664957469927fcee5a1129 diff --git a/src/ui/ui_launcher.cpp b/src/ui/ui_launcher.cpp index d960aa8..f690479 100644 --- a/src/ui/ui_launcher.cpp +++ b/src/ui/ui_launcher.cpp @@ -20,6 +20,11 @@ public: recomp::set_current_menu(recomp::Menu::Config); } ); + recomp::register_event(listener, "exit_game", + [](const std::string& param, Rml::Event& event) { + ultramodern::quit(); + } + ); } void make_bindings(Rml::Context* context) override {