Say "after restart" in the menu only while a restart would change something, and count the waiting settings on Restart.

A setting read at the start showed "after restart" under its value always. The values the game started with are now
kept (cfg.c start_values), a row shows the note only while its value differs from them, and the Restart button counts
the settings that wait, the upscaler, frame generation and HDR among them. A value the environment sets never waits.
--probe-cfg checks the count.

From pull request #377 by mooki000. Three conflicts in the menu resolved against the frame generation rows that came
in since: the upscaling row keeps its description by what can load, and the frame generation restart test knows both
ways NVIDIA's runs.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
chrg6
2026-11-10 09:14:23 -05:00
parent a1fcbb0b07
commit 1f2b320736
11 changed files with 126 additions and 22 deletions

View File

@@ -1,4 +1,5 @@
// --probe-cfg: nx2navi.ini parsing, the environment override and a missing file (cfg.c). Needs no game files.
// --probe-cfg: nx2navi.ini parsing, the environment override, a missing file and the settings waiting for a restart
// (cfg.c). Needs no game files.
#include <math.h>
#include <stdint.h>
#include <stdio.h>
@@ -17,6 +18,26 @@ static int fails;
#define EQ(a, b) ((a) && !strcmp((a), (b)))
int probe_cfg(void) {
// cfg_pending, before this probe's files replace the settings cfg_init read: a restart-only setting counts while its
// value differs from the one at start, a live one never
if (!cfg_from_env("NX2NAVI_MICROPHONE") && !cfg_from_env("NX2NAVI_VOLUME")) {
const char *mic = cfg_value("NX2NAVI_MICROPHONE");
int base = cfg_pending_count();
CHECK(!cfg_pending("NX2NAVI_MICROPHONE"), "pending: unchanged since the start");
cfg_set("NX2NAVI_MICROPHONE", strcmp(mic, "0") ? "0" : "1");
CHECK(cfg_pending("NX2NAVI_MICROPHONE") && cfg_pending_count() == base + 1, "pending: a restart-only setting changed");
cfg_set("NX2NAVI_MICROPHONE", mic);
CHECK(!cfg_pending("NX2NAVI_MICROPHONE") && cfg_pending_count() == base, "pending: set back to its start value");
cfg_set("NX2NAVI_VOLUME", "7");
CHECK(!cfg_pending("NX2NAVI_VOLUME") && cfg_pending_count() == base, "pending: a live setting never counts");
// a value the environment sets after the start (the command line's --monitor arrives that way) never waits:
// no row can change it and a restart keeps it
if (!cfg_from_env("NX2NAVI_MONITOR")) {
cfg_setenv("NX2NAVI_MONITOR", "2");
CHECK(!cfg_pending("NX2NAVI_MONITOR") && cfg_pending_count() == base, "pending: set by the environment after the start");
cfg_setenv("NX2NAVI_MONITOR", NULL);
}
}
char path[1024];
if (!plat_exe_path(path, sizeof path)) return 1;
char *cut = plat_last_sep(path);