4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Fix settings mismatch

Browse source
This commit is contained in:
test 2024-10-05 23:13:09 +09:00 • committed by Ryan Foster
commit 15cd31fdbd
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
UI/window-basic-main.cpp
View file

@ -2313,7 +2313,7 @@ void OBSBasic::OBSInit()
disableColorSpaceConversion(this);
#endif
bool has_last_version = config_has_user_value(App()->GetUserConfig(), "General", "LastVersion");
bool has_last_version = config_has_user_value(App()->GetAppConfig(), "General", "LastVersion");
bool first_run = config_get_bool(App()->GetUserConfig(), "General", "FirstRun");
if (!first_run) {
@ -2326,10 +2326,10 @@ void OBSBasic::OBSInit()
#if (defined(_WIN32) || defined(__APPLE__)) && (OBS_RELEASE_CANDIDATE > 0 || OBS_BETA > 0)
/* Automatically set branch to "beta" the first time a pre-release build is run. */
if (!config_get_bool(App()->GetUserConfig(), "General", "AutoBetaOptIn")) {
config_set_string(App()->GetUserConfig(), "General", "UpdateBranch", "beta");
config_set_bool(App()->GetUserConfig(), "General", "AutoBetaOptIn", true);
config_save_safe(App()->GetUserConfig(), "tmp", nullptr);
if (!config_get_bool(App()->GetAppConfig(), "General", "AutoBetaOptIn")) {
config_set_string(App()->GetAppConfig(), "General", "UpdateBranch", "beta");
config_set_bool(App()->GetAppConfig(), "General", "AutoBetaOptIn", true);
config_save_safe(App()->GetAppConfig(), "tmp", nullptr);
}
#endif
TimedCheckForUpdates();
@ -3825,7 +3825,7 @@ void OBSBasic::TimedCheckForUpdates()
{
if (App()->IsUpdaterDisabled())
return;
if (!config_get_bool(App()->GetUserConfig(), "General", "EnableAutoUpdates"))
if (!config_get_bool(App()->GetAppConfig(), "General", "EnableAutoUpdates"))
return;
#if defined(ENABLE_SPARKLE_UPDATER)