From 4bd519f3127b20f03f459bbe76b0423c9a3b6117 Mon Sep 17 00:00:00 2001
From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com>
Date: Fri, 29 Nov 2024 12:53:56 +1000
Subject: [PATCH] mod menu refresh button bug fixes

- stop players from going back from the main menu during a refresh
- don't respond to category changes during a refresh
---
 src/pc/djui/djui_panel.c           | 3 +++
 src/pc/djui/djui_panel.h           | 2 ++
 src/pc/djui/djui_panel_host_mods.c | 8 +++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/pc/djui/djui_panel.c b/src/pc/djui/djui_panel.c
index e0253303e..1d0702993 100644
--- a/src/pc/djui/djui_panel.c
+++ b/src/pc/djui/djui_panel.c
@@ -13,6 +13,8 @@ static struct DjuiPanel* sPanelList = NULL;
 static struct DjuiPanel* sPanelRemoving = NULL;
 static f32 sMoveAmount = 0;
 
+bool gDjuiPanelDisableBack = false;
+
 bool djui_panel_is_active(void) {
     return (sPanelList != NULL);
 }
@@ -96,6 +98,7 @@ struct DjuiPanel* djui_panel_add(struct DjuiBase* caller, struct DjuiThreePanel*
 void djui_panel_back(void) {
     if (sPanelRemoving != NULL) { return; }
     if (sPanelList == NULL) { return; }
+    if (gDjuiPanelDisableBack) { return; }
     if (sPanelList->parent == NULL) {
         if (gDjuiPanelPauseCreated) { djui_panel_shutdown(); }
         return;
diff --git a/src/pc/djui/djui_panel.h b/src/pc/djui/djui_panel.h
index 0f01af37c..dd752c953 100644
--- a/src/pc/djui/djui_panel.h
+++ b/src/pc/djui/djui_panel.h
@@ -14,6 +14,8 @@ struct DjuiPanel {
     void (*on_panel_destroy)(struct DjuiBase*);
 };
 
+extern bool gDjuiPanelDisableBack;
+
 bool djui_panel_is_active(void);
 struct DjuiPanel* djui_panel_add(struct DjuiBase* caller, struct DjuiThreePanel* threePanel, struct DjuiBase* defaultElementBase);
 void djui_panel_back(void);
diff --git a/src/pc/djui/djui_panel_host_mods.c b/src/pc/djui/djui_panel_host_mods.c
index 8e9d2035b..ff1708987 100644
--- a/src/pc/djui/djui_panel_host_mods.c
+++ b/src/pc/djui/djui_panel_host_mods.c
@@ -23,6 +23,7 @@ static struct DjuiFlowLayout* sModLayout = NULL;
 static struct DjuiThreePanel* sDescriptionPanel = NULL;
 static struct DjuiText* sTooltip = NULL;
 static struct DjuiPaginated* sModPaginated = NULL;
+static struct DjuiButton* sBackButton = NULL;
 static struct DjuiButton* sRefreshButton = NULL;
 unsigned int selectedCategory = MOD_CATEGORY_ALL;
 static bool sWarned = false;
@@ -172,6 +173,7 @@ void djui_panel_host_mods_add_mods(struct DjuiBase* layoutBase) {
 }
 
 static void djui_panel_on_categories_change(UNUSED struct DjuiBase* caller) {
+    if (gModRefreshThread.state == RUNNING) { return; }
     djui_base_destroy_children(&sModLayout->base);
     djui_panel_host_mods_add_mods(&sModLayout->base);
     djui_paginated_calculate_height(sModPaginated);
@@ -188,6 +190,8 @@ static void* threaded_mod_refresh(void*) {
 
     djui_text_set_text(sRefreshButton->text, DLANG(LOBBIES, REFRESH));
     djui_base_set_enabled(&sRefreshButton->base, true);
+    djui_base_set_enabled(&sBackButton->base, true);
+    gDjuiPanelDisableBack = false;
 
     return NULL;
 }
@@ -197,6 +201,8 @@ static void djui_panel_menu_refresh(UNUSED struct DjuiBase* base) {
     if (init_thread_handle(&gModRefreshThread, threaded_mod_refresh, NULL, NULL, 0) == 0) {
         djui_text_set_text(sRefreshButton->text, DLANG(LOBBIES, REFRESHING));
         djui_base_set_enabled(&sRefreshButton->base, false);
+        djui_base_set_enabled(&sBackButton->base, false);
+        gDjuiPanelDisableBack = true;
     } else {
         threaded_mod_refresh(NULL);
     }
@@ -229,7 +235,7 @@ void djui_panel_host_mods_create(struct DjuiBase* caller) {
         if (gNetworkType == NT_NONE) {
             struct DjuiRect* rect1 = djui_rect_container_create(body, 64);
             {
-                djui_button_left_create(&rect1->base, DLANG(MENU, BACK), DJUI_BUTTON_STYLE_BACK, djui_panel_menu_back);
+                sBackButton = djui_button_left_create(&rect1->base, DLANG(MENU, BACK), DJUI_BUTTON_STYLE_BACK, djui_panel_menu_back);
                 sRefreshButton = djui_button_right_create(&rect1->base, DLANG(LOBBIES, REFRESH), DJUI_BUTTON_STYLE_NORMAL, djui_panel_menu_refresh);
             }
         } else {