Fix small settings and overlay edge cases.

- An empty NX2NAVI_SPIN or NX2NAVI_VRAM_HEADROOM in the environment stopped the game: both read the key with
  cfg_bool, and an empty value falls back to the settings table, where these keys have no row. Empty now means unset.
- find_ini checked for 10 bytes after the exe folder's separator where "nx2navi.ini" and its NUL take 12, so an exe
  path just under 1024 bytes wrote two bytes past the buffer.
- The performance overlay read the clock before taking the lock, so a frame pushed in between was newer than "now",
  the unsigned age wrapped and the overlay showed 0 fps for that refresh.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
chrg6
2026-11-08 09:22:03 -05:00
parent ffe13e1d52
commit b69b613984
4 changed files with 9 additions and 4 deletions

View File

@@ -706,7 +706,7 @@ static int find_ini(void) {
if (!plat_exe_path(path, sizeof path)) return 0;
char *cut = plat_last_sep(path);
if (!cut) cut = strrchr(path, '/');
if (!cut || cut + 10 >= path + sizeof path) return 0;
if (!cut || cut + 12 >= path + sizeof path) return 0; // room for "nx2navi.ini" and its NUL after the separator
strcpy(cut + 1, "nx2navi.ini");
snprintf(ini_path, sizeof ini_path, "%s", path);
return 1;

View File

@@ -1098,7 +1098,9 @@ void rt_spin_gate(Cpu *c, uint64_t head) {
if (g_spin_on < 0) {
const char *e = cfg_get("NX2NAVI_SPIN_HANDOFF_US");
g_spin_handoff_ns = (uint64_t)(e && *e ? atoll(e) : 50) * 1000;
g_spin_on = !(cfg_get("NX2NAVI_SPIN") && !cfg_bool("NX2NAVI_SPIN"));
// an empty value is unset: cfg_bool of a key without a settings row would stop the game on it
const char *spin = cfg_get("NX2NAVI_SPIN");
g_spin_on = !(spin && *spin && !cfg_bool("NX2NAVI_SPIN"));
}
t->sp_n++;
t->sp_site = head;

View File

@@ -380,8 +380,10 @@ void perfmon_mode(int mode) {
}
void perfmon_snapshot(PerfStats *out) {
uint64_t now = plat_now_ns();
// the time under the lock: a frame pushed between the two would be newer than now, and now - at wrapping would
// end the frame window at once (0 fps on the overlay)
plat_mutex_lock(&g_lock);
uint64_t now = plat_now_ns();
frames_summary(&g_stats, now);
counters_summary(now);
*out = g_stats;

View File

@@ -49,7 +49,8 @@ static void VKAPI_PTR on_allocate(VmaAllocator a, uint32_t type, VkDeviceMemory
const VmaDeviceMemoryCallbacks *vk_headroom_callbacks(void) {
static const VmaDeviceMemoryCallbacks cb = {.pfnAllocate = on_allocate};
H.on = !cfg_get("NX2NAVI_VRAM_HEADROOM") || cfg_bool("NX2NAVI_VRAM_HEADROOM");
const char *v = cfg_get("NX2NAVI_VRAM_HEADROOM"); // empty is unset: the key has no settings row for cfg_bool
H.on = !v || !*v || cfg_bool("NX2NAVI_VRAM_HEADROOM");
return H.on ? &cb : NULL;
}