From 2b3c19ec0a3ada1717ca0c63fbbdad1b5cb91489 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Tue, 23 Jul 2024 12:13:51 -0700
Subject: [PATCH] client: fix minor prefs parsing bug

If we parse for a target venue, and it's present,
and mod_time/source_project/source_scheduler appear after the venue,
we were failing to parse them.
---
 lib/prefs.cpp | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/lib/prefs.cpp b/lib/prefs.cpp
index 5016cc23e8..0dd2453805 100644
--- a/lib/prefs.cpp
+++ b/lib/prefs.cpp
@@ -408,15 +408,28 @@ int GLOBAL_PREFS::parse_override(
             }
             return 0;
         }
+        // parse these first; they're independent of venue
+        //
+        if (xp.parse_str("source_project", source_project, sizeof(source_project))) {
+            continue;
+        }
+        if (xp.parse_str("source_scheduler", source_scheduler, sizeof(source_scheduler))) {
+            continue;
+        }
+        if (xp.parse_double("mod_time", mod_time)) {
+            double now = dtime();
+            if (mod_time > now) {
+                mod_time = now;
+            }
+            continue;
+        }
         if (in_venue) {
             if (xp.match_tag("/venue")) {
-                if (in_correct_venue) {
-                    return 0;
-                } else {
-                    in_venue = false;
-                    continue;
-                }
+                in_venue = false;
+                continue;
             } else {
+                // we're in a venue but not the right one; skip tag
+                //
                 if (!in_correct_venue) continue;
             }
         } else {
@@ -434,17 +447,11 @@ int GLOBAL_PREFS::parse_override(
                 }
                 continue;
             }
-        }
-        if (xp.parse_str("source_project", source_project, sizeof(source_project))) continue;
-        if (xp.parse_str("source_scheduler", source_scheduler, sizeof(source_scheduler))) {
-            continue;
-        }
-        if (xp.parse_double("mod_time", mod_time)) {
-            double now = dtime();
-            if (mod_time > now) {
-                mod_time = now;
+            if (found_venue) {
+                // we already found and parsed the target venue;
+                // skip subsequent prefs tags not in a venue
+                continue;
             }
-            continue;
         }
         if (xp.parse_double("battery_charge_min_pct", battery_charge_min_pct)) {
             mask.battery_charge_min_pct = true;