1 files changed, 16 insertions, 3 deletions

diff --git a/src/menu.cpp b/src/menu.cpp
index 9dffc9e..56fe6fa 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -625,9 +625,15 @@ int silentaim_fov() { return g_silent_fov; }
 
 bool aimbot_fov_circle() { return g_aim_fov_circle; }
 
+void menu_force_close() {
+  g_menu_open = false;
+  g_bind_mode = false;
+  g_insert_latch = false;
+  g_menu_draw_logged = false;
+}
+
 static void menu_handle_input() {
   poll_keyboard();
-
   // SDL state can be sampled several times per rendered frame (both ISurface
   // hooks call outer_draw). Use a physical-key latch instead of the one-poll
   // edge so one press cannot open and close the menu in the same frame.
@@ -838,11 +844,13 @@ void draw_text_col(int x, int y, const char *text, int r, int g, int b) {
 // (see hkdDrawPrintText hook in hl2h.cpp): we wrap our draws in
 // PushMakeCurrent/PopMakeCurrent so they are submitted with a clean clip.
 void outer_draw() {
-  menu_handle_input();
+  gui_handle_input();
+  if (!gui_is_open())
+    menu_handle_input();
   // HL2H_DRAW_TEST=1 draws a probe rect without needing the menu open
   static bool draw_test = getenv("HL2H_DRAW_TEST") != nullptr;
   bool esp_on = feature_active(FEAT_ESP);
-  if (!g_surface || (!g_menu_open && !draw_test && !esp_on))
+  if (!g_surface || (!g_menu_open && !gui_is_open() && !draw_test && !esp_on))
     return;
 
   // Level/menu -> game transitions can invalidate the VGUI font handle.
@@ -896,6 +904,11 @@ void outer_draw() {
     surf_draw_set_color(255, 255, 255, 255);
     draw_text(28, 36, "HL2H DRAW TEST");
   }
+  if (gui_is_open()) {
+    gui_draw();
+    surf_pop_make_current(panel);
+    return;
+  }
   if (!g_menu_open) {
     surf_pop_make_current(panel);
     return;