From ad3d2a8767f51a76a1497ddeed59e7321cdb837b Mon Sep 17 00:00:00 2001 From: Azumgi <4zumgi@gmail.com> Date: Wed, 7 Nov 2018 16:42:52 +0300 Subject: [PATCH] [Custom Views] Add check if view is active --- .../mods/vmf/modules/gui/custom_views.lua | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/vmf/scripts/mods/vmf/modules/gui/custom_views.lua b/vmf/scripts/mods/vmf/modules/gui/custom_views.lua index 5007a77..72e0c9a 100644 --- a/vmf/scripts/mods/vmf/modules/gui/custom_views.lua +++ b/vmf/scripts/mods/vmf/modules/gui/custom_views.lua @@ -331,19 +331,21 @@ function vmf.keybind_toggle_view(mod, view_name, can_be_opened, is_keybind_press return end - local keybind_transitions = _views_data[view_name].view_settings.keybind_transitions - if _ingame_ui.current_view == view_name then - if keybind_transitions.close_view_transition then - mod:handle_transition(keybind_transitions.close_view_transition, - keybind_transitions.close_view_transition_params, - keybind_transitions.transition_fade, true) - end - -- Can open views only when keybind is pressed. - elseif can_be_opened and is_keybind_pressed then - if keybind_transitions.open_view_transition then - mod:handle_transition(keybind_transitions.open_view_transition, - keybind_transitions.close_view_transition_params, - keybind_transitions.transition_fade, true) + if is_view_active_for_current_level(view_name) then + local keybind_transitions = _views_data[view_name].view_settings.keybind_transitions + if _ingame_ui.current_view == view_name then + if keybind_transitions.close_view_transition then + mod:handle_transition(keybind_transitions.close_view_transition, + keybind_transitions.close_view_transition_params, + keybind_transitions.transition_fade, true) + end + -- Can open views only when keybind is pressed. + elseif can_be_opened and is_keybind_pressed then + if keybind_transitions.open_view_transition then + mod:handle_transition(keybind_transitions.open_view_transition, + keybind_transitions.close_view_transition_params, + keybind_transitions.transition_fade, true) + end end end end