From 8c0c21806179e72b001bb0d45e2b6da17cb4f0d1 Mon Sep 17 00:00:00 2001 From: BreadFish64 Date: Tue, 7 Apr 2020 11:40:44 -0500 Subject: [PATCH] android: fix opening settings menu in-game --- .../java/org/citra/citra_emu/activities/EmulationActivity.java | 2 ++ src/core/settings.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java index 9055687b4..5bde8ed91 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java @@ -83,6 +83,8 @@ public final class EmulationActivity extends AppCompatActivity { .append(R.id.menu_emulation_reset_overlay, EmulationActivity.MENU_ACTION_RESET_OVERLAY); buttonsActionsMap .append(R.id.menu_emulation_show_overlay, EmulationActivity.MENU_ACTION_SHOW_OVERLAY); + buttonsActionsMap + .append(R.id.menu_emulation_open_settings,EmulationActivity.MENU_ACTION_OPEN_SETTINGS); } private View mDecorView; diff --git a/src/core/settings.cpp b/src/core/settings.cpp index cc3ca7e1a..5ed4abc5a 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -33,9 +33,11 @@ void Apply() { VideoCore::g_hw_shader_accurate_mul = values.shaders_accurate_mul; VideoCore::g_use_disk_shader_cache = values.use_disk_shader_cache; +#ifndef ANDROID if (VideoCore::g_renderer) { VideoCore::g_renderer->UpdateCurrentFramebufferLayout(); } +#endif VideoCore::g_renderer_bg_color_update_requested = true; VideoCore::g_renderer_sampler_update_requested = true;