From b21ebe75d412c72441be8a63c202641cc5ff4dfa Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Wed, 22 Nov 2017 11:18:36 -0800 Subject: Pause menu now triggered on ui.exit event --HG-- branch : nuklear_ui --- io.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'io.c') diff --git a/io.c b/io.c index 7b5d404..22881c1 100644 --- a/io.c +++ b/io.c @@ -23,6 +23,9 @@ #include "render.h" #include "util.h" #include "menu.h" +#ifndef DISABLE_NUKLEAR +#include "nuklear_ui/blastem_nuklear.h" +#endif #define CYCLE_NEVER 0xFFFFFFFF #define MIN_POLL_INTERVAL 6840 @@ -532,6 +535,11 @@ void handle_binding_up(keybinding * binding) break; } case UI_EXIT: +#ifndef DISABLE_NUKLEAR + if (is_nuklear_active) { + show_pause_menu(); + } else { +#endif current_system->request_exit(current_system); if (current_system->type == SYSTEM_GENESIS) { genesis_context *gen = (genesis_context *)current_system; @@ -541,6 +549,9 @@ void handle_binding_up(keybinding * binding) menu->external_game_load = 1; } } +#ifndef DISABLE_NUKLEAR + } +#endif break; } break; -- cgit v1.2.3