Skip to content

Fix bug where updating archive cvars sometimes does not write autogen.cfg #1876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slipher wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −8
Open

Fix bug where updating archive cvars sometimes does not write autogen.cfg #1876

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
784389e
Cleanup: InternalSetValue flags argument always 0
slipher Dec 7, 2025
2fbecd5
Fix cvar changes sometimes not writing autogen
slipher Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/engine/framework/CvarSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ namespace Cvar {
cvar->description = std::move(realDescription);
}

void InternalSetValue(const std::string& cvarName, std::string value, int flags, bool rom, bool warnRom) {
void InternalSetValue(const std::string& cvarName, std::string value, bool rom, bool warnRom) {
CvarMap& cvars = GetCvarMap();

auto it = cvars.find(cvarName);
Expand All @@ -235,7 +235,7 @@ namespace Cvar {
}

//The user creates a new cvar through a command.
cvars[cvarName] = new cvarRecord_t{value, value, Util::nullopt, flags | CVAR_USER_CREATED, "user created", nullptr, {}};
cvars[cvarName] = new cvarRecord_t{value, value, Util::nullopt, CVAR_USER_CREATED, "user created", nullptr, {}};
Cmd::AddCommand(cvarName, cvarCommand, "cvar - user created");
GetCCvar(cvarName, *cvars[cvarName]);

Expand Down Expand Up @@ -263,8 +263,6 @@ namespace Cvar {
}
}

cvar->flags |= flags;

// mark for archival if flagged as archive-on-change
if (cvar->flags & ARCHIVE) {
cvar->flags |= USER_ARCHIVE;
Expand Down Expand Up @@ -302,11 +300,11 @@ namespace Cvar {

// Simple proxies for InternalSetValue
void SetValue(const std::string& cvarName, const std::string& value) {
InternalSetValue(cvarName, value, 0, false, true);
InternalSetValue(cvarName, value, false, true);
}

void SetValueForce(const std::string& cvarName, const std::string& value) {
InternalSetValue(cvarName, value, 0, true, true);
InternalSetValue(cvarName, value, true, true);
}

std::string GetValue(const std::string& cvarName) {
Expand Down Expand Up @@ -418,8 +416,8 @@ namespace Cvar {
}

cvar->flags |= flags;
cvar->ccvar.flags |= flags;

//TODO: remove it, overkill ?
//Make sure to trigger the event as if this variable was changed
cvar_modifiedFlags |= flags;
return true; // success
Expand Down Expand Up @@ -578,7 +576,7 @@ namespace Cvar {
}

void SetValueCProxy(const std::string& cvarName, const std::string& value) {
InternalSetValue(cvarName, value, 0, true, false);
InternalSetValue(cvarName, value, true, false);
}

/*
Expand Down
Loading