jackcartersmith/gse
1
0
Fork 0
Code Issues Pull Requests Actions Releases Activity

is_beta_branch fix, as pointed by wizark952

Browse Source 
should now be correctly parsed from 'app::general' instead of 'main::general'
This commit is contained in:
alex47exe 2024-10-14 17:45:32 +01:00
parent 174d2df50a
commit 0745935be0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dll/settings_parser.cpp
View File

@ -1207,6 +1207,10 @@ static bool parse_branches_file(
return false; return false;
} }
// app::general::is_beta_branch
settings_client->is_beta_branch = ini.GetBoolValue("app::general", "is_beta_branch", settings_client->is_beta_branch);
settings_server->is_beta_branch = ini.GetBoolValue("app::general", "is_beta_branch", settings_server->is_beta_branch);
// app::general::branch_name // app::general::branch_name
std::string selected_branch = common_helpers::string_strip(ini.GetValue("app::general", "branch_name", "")); std::string selected_branch = common_helpers::string_strip(ini.GetValue("app::general", "branch_name", ""));
if (selected_branch.empty()) { if (selected_branch.empty()) {
@ -1376,9 +1380,6 @@ static void parse_simple_features(class Settings *settings_client, class Setting
settings_client->disable_account_avatar = !ini.GetBoolValue("main::general", "enable_account_avatar", !settings_client->disable_account_avatar); settings_client->disable_account_avatar = !ini.GetBoolValue("main::general", "enable_account_avatar", !settings_client->disable_account_avatar);
settings_server->disable_account_avatar = !ini.GetBoolValue("main::general", "enable_account_avatar", !settings_server->disable_account_avatar); settings_server->disable_account_avatar = !ini.GetBoolValue("main::general", "enable_account_avatar", !settings_server->disable_account_avatar);
settings_client->is_beta_branch = ini.GetBoolValue("main::general", "is_beta_branch", settings_client->is_beta_branch);
settings_server->is_beta_branch = ini.GetBoolValue("main::general", "is_beta_branch", settings_server->is_beta_branch);
settings_client->steam_deck = ini.GetBoolValue("main::general", "steam_deck", settings_client->steam_deck); settings_client->steam_deck = ini.GetBoolValue("main::general", "steam_deck", settings_client->steam_deck);
settings_server->steam_deck = ini.GetBoolValue("main::general", "steam_deck", settings_server->steam_deck); settings_server->steam_deck = ini.GetBoolValue("main::general", "steam_deck", settings_server->steam_deck);

2
tools/migrate_gse/main.py
View File

@ -152,7 +152,7 @@ def convert_to_ini(global_settings: str):
elif file == 'immediate_gameserver_stats.txt': elif file == 'immediate_gameserver_stats.txt':
configs_main["main::general"]["immediate_gameserver_stats"] = 1 #updated ini through ConfigObj configs_main["main::general"]["immediate_gameserver_stats"] = 1 #updated ini through ConfigObj
elif file == 'is_beta_branch.txt': elif file == 'is_beta_branch.txt':
configs_main["main::general"]["is_beta_branch"] = 1 #updated ini through ConfigObj configs_app["app::general"]["is_beta_branch"] = 1 #updated ini through ConfigObj
elif file == 'matchmaking_server_details_via_source_query.txt': elif file == 'matchmaking_server_details_via_source_query.txt':
configs_main["main::general"]["matchmaking_server_details_via_source_query"] = 1 #updated ini through ConfigObj configs_main["main::general"]["matchmaking_server_details_via_source_query"] = 1 #updated ini through ConfigObj
elif file == 'matchmaking_server_list_actual_type.txt': elif file == 'matchmaking_server_list_actual_type.txt':