Fixing checkboxes and hotkeys not working at all outside of coop. Suppressing full file reload whenever manual goals a checked off. Fixed issue with background texture of stat-categories not updating properly.

Author: LNXSeus

source/global_event_handler.cpp

@@ -67,7 +67,9 @@ void handle_global_events(Tracker *t, Overlay *o, AppSettings *app_settings,
                 // CUSTOM GOAL HOTKEYS
                 // Hotkeys don't work when in visual layout editing mode
                 // Co-op: Receivers with host-only custom goals cannot use counter hotkeys
-                bool coop_hotkeys_blocked = (app_settings->network_mode == NETWORK_RECEIVER &&
+                bool rcv_in_lobby = (app_settings->network_mode == NETWORK_RECEIVER &&
+                                     g_coop_ctx && coop_net_get_state(g_coop_ctx) == COOP_NET_CONNECTED);
+                bool coop_hotkeys_blocked = (rcv_in_lobby &&
                                              app_settings->coop_custom_goal_mode == COOP_CUSTOM_HOST_ONLY);
                 if (t && t->template_data && t->template_data->custom_goals &&
                     !t->is_visual_layout_editing && !coop_hotkeys_blocked) {
@@ -98,9 +100,8 @@ void handle_global_events(Tracker *t, Overlay *o, AppSettings *app_settings,
 
                         if (mod_action >= 0) {
                             // Co-op Receiver: send modification to host
-                            if (app_settings->network_mode == NETWORK_RECEIVER &&
-                                app_settings->coop_custom_goal_mode == COOP_CUSTOM_ANY_PLAYER &&
-                                g_coop_ctx) {
+                            if (rcv_in_lobby &&
+                                app_settings->coop_custom_goal_mode == COOP_CUSTOM_ANY_PLAYER) {
                                 CoopCustomGoalModMsg mod = {};
                                 snprintf(mod.goal_root_name, sizeof(mod.goal_root_name),
                                          "%s", target_goal->root_name);
@@ -114,6 +115,12 @@ void handle_global_events(Tracker *t, Overlay *o, AppSettings *app_settings,
                                 } else {
                                     target_goal->progress--;
                                 }
+                                // Recalculate done state immediately so the background
+                                // texture updates this frame (not deferred to file re-read)
+                                if (target_goal->goal > 0) {
+                                    target_goal->done = (target_goal->progress >= target_goal->goal);
+                                }
+                                SDL_SetAtomicInt(&g_suppress_settings_watch, 1);
                                 settings_save(app_settings, t->template_data, SAVE_CONTEXT_ALL);
                                 SDL_SetAtomicInt(&g_coop_broadcast_needed, 1);
                                 SDL_SetAtomicInt(&g_game_data_changed, 1);

source/global_event_handler.h

@@ -34,6 +34,7 @@ extern SDL_AtomicInt g_notes_changed; // To signal that the notes.txt file needs
 extern SDL_AtomicInt g_apply_button_clicked; // To signal when overlay window should restart (on apply button click)
 extern SDL_AtomicInt g_templates_changed; // To signal that the template list needs to be rescanned.
 extern SDL_AtomicInt g_coop_broadcast_needed; // Custom goal change: broadcast + IPC without full file re-merge
+extern SDL_AtomicInt g_suppress_settings_watch; // Suppress dmon settings watcher for app-initiated saves
 extern ForceOpenReason g_force_open_reason; // Flag to force settings open on invalid path
 
 /**

source/main.cpp

@@ -633,6 +633,10 @@ static void global_watch_callback(dmon_watch_id watch_id, dmon_action action, co
 /**
  * @brief Callback for dmon watching the CONFIG directory for settings.json.
  */
+// Flag to suppress dmon settings watcher when the app itself writes to settings.json
+// (e.g. checkbox toggles, hotkey counters). Prevents a destructive full reinit cycle.
+SDL_AtomicInt g_suppress_settings_watch;
+
 static void settings_watch_callback(dmon_watch_id watch_id, dmon_action action, const char *rootdir,
                                     const char *filepath, const char *oldfilepath, void *user) {
     (void) watch_id;
@@ -647,6 +651,12 @@ static void settings_watch_callback(dmon_watch_id watch_id, dmon_action action,
         log_message(LOG_INFO, "[DEBUG - DMON - MAIN] Settings Watcher triggered by file: %s\n", filepath);
         // ----------------
         if (strcmp(filepath, "settings.json") == 0) {
+            // If the app itself wrote settings.json (e.g. checkbox toggle, counter hotkey),
+            // suppress the watcher to avoid a destructive full template reinit.
+            if (SDL_SetAtomicInt(&g_suppress_settings_watch, 0) == 1) {
+                log_message(LOG_INFO, "[DMON - MAIN] settings.json modified by app — suppressed.\n");
+                return;
+            }
             log_message(LOG_INFO, "[DMON - MAIN] settings.json modified. Triggering update.\n");
 
             SDL_SetAtomicInt(&g_settings_changed, 1);

source/tracker.cpp

@@ -4282,10 +4282,8 @@ void tracker_apply_coop_mods(Tracker *t, const AppSettings *settings,
 
                 if (mod->action == COOP_MOD_TOGGLE) {
                     cat->is_manually_completed = !cat->is_manually_completed;
-                    bool all_children_done = (cat->criteria_count > 0 &&
-                                              cat->completed_criteria_count >= cat->criteria_count);
-                    cat->done = cat->is_manually_completed || all_children_done;
 
+                    // Recalculate children FIRST so completed_criteria_count is correct
                     for (int j = 0; j < cat->criteria_count; j++) {
                         TrackableItem *crit = cat->criteria[j];
                         bool crit_naturally_done = (crit->goal > 0 && crit->progress >= crit->goal);
@@ -4295,6 +4293,11 @@ void tracker_apply_coop_mods(Tracker *t, const AppSettings *settings,
                     for (int k = 0; k < cat->criteria_count; k++) {
                         if (cat->criteria[k]->done) cat->completed_criteria_count++;
                     }
+
+                    // Now calculate parent done based on updated children
+                    bool all_children_done = (cat->criteria_count > 0 &&
+                                              cat->completed_criteria_count >= cat->criteria_count);
+                    cat->done = cat->is_manually_completed || all_children_done;
                     any_applied = true;
                 }
                 break;
@@ -4331,6 +4334,7 @@ void tracker_apply_coop_mods(Tracker *t, const AppSettings *settings,
     }
 
     if (any_applied) {
+        SDL_SetAtomicInt(&g_suppress_settings_watch, 1);
         settings_save(settings, td, SAVE_CONTEXT_ALL);
     }
 }
@@ -5958,12 +5962,13 @@ static void render_trackable_category_section(Tracker *t, const AppSettings *set
                             // Co-op: Receivers respect stat checkbox permission
                             if (is_hovered && ImGui::IsMouseClicked(ImGuiMouseButton_Left) && !t->
                                 is_visual_layout_editing) {
-                                if (settings->network_mode == NETWORK_RECEIVER &&
+                                bool rcv_in_lobby = (settings->network_mode == NETWORK_RECEIVER &&
+                                    g_coop_ctx && coop_net_get_state(g_coop_ctx) == COOP_NET_CONNECTED);
+                                if (rcv_in_lobby &&
                                     settings->coop_stat_checkbox == COOP_STAT_CHECKBOX_HOST_ONLY) {
                                     // Host-only mode: clicking disabled for receivers
-                                } else if (settings->network_mode == NETWORK_RECEIVER &&
-                                           settings->coop_stat_checkbox == COOP_STAT_CHECKBOX_ANY_PLAYER &&
-                                           g_coop_ctx) {
+                                } else if (rcv_in_lobby &&
+                                           settings->coop_stat_checkbox == COOP_STAT_CHECKBOX_ANY_PLAYER) {
                                     // Any-player mode: send toggle request to host
                                     CoopCustomGoalModMsg mod = {};
                                     snprintf(mod.goal_root_name, sizeof(mod.goal_root_name), "%s", crit->root_name);
@@ -5985,6 +5990,7 @@ static void render_trackable_category_section(Tracker *t, const AppSettings *set
                                         criteria_count);
                                     cat->done = cat->is_manually_completed || all_children_done;
 
+                                    SDL_SetAtomicInt(&g_suppress_settings_watch, 1);
                                     settings_save(settings, t->template_data, SAVE_CONTEXT_ALL);
                                     SDL_SetAtomicInt(&g_coop_broadcast_needed, 1);
                                     SDL_SetAtomicInt(&g_game_data_changed, 1);
@@ -6214,12 +6220,13 @@ static void render_trackable_category_section(Tracker *t, const AppSettings *set
                     // Co-op: Receivers respect stat checkbox permission
                     if (is_hovered_parent && ImGui::IsMouseClicked(ImGuiMouseButton_Left) && !t->
                         is_visual_layout_editing) {
-                        if (settings->network_mode == NETWORK_RECEIVER &&
+                        bool rcv_in_lobby = (settings->network_mode == NETWORK_RECEIVER &&
+                            g_coop_ctx && coop_net_get_state(g_coop_ctx) == COOP_NET_CONNECTED);
+                        if (rcv_in_lobby &&
                             settings->coop_stat_checkbox == COOP_STAT_CHECKBOX_HOST_ONLY) {
                             // Host-only mode: clicking disabled for receivers
-                        } else if (settings->network_mode == NETWORK_RECEIVER &&
-                                   settings->coop_stat_checkbox == COOP_STAT_CHECKBOX_ANY_PLAYER &&
-                                   g_coop_ctx) {
+                        } else if (rcv_in_lobby &&
+                                   settings->coop_stat_checkbox == COOP_STAT_CHECKBOX_ANY_PLAYER) {
                             // Any-player mode: send toggle request to host (parent stat)
                             CoopCustomGoalModMsg mod = {};
                             snprintf(mod.goal_root_name, sizeof(mod.goal_root_name), "%s", cat->root_name);
@@ -6229,10 +6236,8 @@ static void render_trackable_category_section(Tracker *t, const AppSettings *set
                         } else {
                             // Host or singleplayer: toggle locally
                             cat->is_manually_completed = !cat->is_manually_completed;
-                            bool all_children_naturally_done = (
-                                cat->criteria_count > 0 && cat->completed_criteria_count >= cat->criteria_count);
-                            cat->done = cat->is_manually_completed || all_children_naturally_done;
 
+                            // Recalculate children FIRST so completed_criteria_count is correct
                             for (int j = 0; j < cat->criteria_count; ++j) {
                                 TrackableItem *crit = cat->criteria[j];
                                 bool crit_naturally_done = (crit->goal > 0 && crit->progress >= crit->goal);
@@ -6244,6 +6249,12 @@ static void render_trackable_category_section(Tracker *t, const AppSettings *set
                                 if (cat->criteria[k]->done) cat->completed_criteria_count++;
                             }
 
+                            // Now calculate parent done based on updated children
+                            bool all_children_done = (
+                                cat->criteria_count > 0 && cat->completed_criteria_count >= cat->criteria_count);
+                            cat->done = cat->is_manually_completed || all_children_done;
+
+                            SDL_SetAtomicInt(&g_suppress_settings_watch, 1);
                             settings_save(settings, t->template_data, SAVE_CONTEXT_ALL);
                             SDL_SetAtomicInt(&g_coop_broadcast_needed, 1);
                             SDL_SetAtomicInt(&g_game_data_changed, 1);
@@ -7206,7 +7217,9 @@ static void render_custom_goals_section(Tracker *t, const AppSettings *settings,
                 // Deactivating when in visual layout editor mode
                 // Co-op: Receivers respect custom goal permission
                 // Co-op: Show tooltip for host-only custom goals
-                if (is_hovered && settings->network_mode == NETWORK_RECEIVER &&
+                bool rcv_in_lobby = (settings->network_mode == NETWORK_RECEIVER &&
+                    g_coop_ctx && coop_net_get_state(g_coop_ctx) == COOP_NET_CONNECTED);
+                if (is_hovered && rcv_in_lobby &&
                     settings->coop_custom_goal_mode == COOP_CUSTOM_HOST_ONLY) {
                     char tooltip_buf[128];
                     snprintf(tooltip_buf, sizeof(tooltip_buf),
@@ -7215,12 +7228,11 @@ static void render_custom_goals_section(Tracker *t, const AppSettings *settings,
                 }
 
                 if (is_hovered && ImGui::IsMouseClicked(ImGuiMouseButton_Left) && !t->is_visual_layout_editing) {
-                    if (settings->network_mode == NETWORK_RECEIVER &&
+                    if (rcv_in_lobby &&
                         settings->coop_custom_goal_mode == COOP_CUSTOM_HOST_ONLY) {
                         // Host-only mode: clicking disabled for receivers
-                    } else if (settings->network_mode == NETWORK_RECEIVER &&
-                               settings->coop_custom_goal_mode == COOP_CUSTOM_ANY_PLAYER &&
-                               g_coop_ctx) {
+                    } else if (rcv_in_lobby &&
+                               settings->coop_custom_goal_mode == COOP_CUSTOM_ANY_PLAYER) {
                         // Any-player mode: send toggle request to host
                         CoopCustomGoalModMsg mod = {};
                         snprintf(mod.goal_root_name, sizeof(mod.goal_root_name), "%s", item->root_name);
@@ -7239,6 +7251,7 @@ static void render_custom_goals_section(Tracker *t, const AppSettings *settings,
                                                                        item->linked_goal_mode));
                         }
                         item->progress = item->done ? 1 : 0;
+                        SDL_SetAtomicInt(&g_suppress_settings_watch, 1);
                         settings_save(settings, t->template_data, SAVE_CONTEXT_ALL);
                         // Lightweight broadcast path: no full file re-merge needed for custom goals
                         SDL_SetAtomicInt(&g_coop_broadcast_needed, 1);