diff --git a/forms/advanced-scene-switcher.ui b/forms/advanced-scene-switcher.ui index 36d65cb7..14201771 100644 --- a/forms/advanced-scene-switcher.ui +++ b/forms/advanced-scene-switcher.ui @@ -35,7 +35,7 @@ - 0 + 1 true diff --git a/lib/general.cpp b/lib/general.cpp index 31fd68cf..e427045e 100644 --- a/lib/general.cpp +++ b/lib/general.cpp @@ -641,6 +641,7 @@ void SwitcherData::LoadGeneralSettings(obs_data_t *obj) cooldown.Load(obj, "cooldown"); + obs_data_set_default_bool(obj, "active", true); stop = !obs_data_get_bool(obj, "active"); startupBehavior = (StartupBehavior)obs_data_get_int(obj, "startup_behavior"); diff --git a/lib/legacy/switch-network.cpp b/lib/legacy/switch-network.cpp index 8c2ddca0..f02252f1 100644 --- a/lib/legacy/switch-network.cpp +++ b/lib/legacy/switch-network.cpp @@ -84,11 +84,11 @@ void NetworkConfig::Save(obs_data_t *obj) void NetworkConfig::SetDefaults(obs_data_t *obj) { - obs_data_set_default_bool(obj, PARAM_SERVER_ENABLE, ServerEnabled); + obs_data_set_default_bool(obj, PARAM_SERVER_ENABLE, false); obs_data_set_default_int(obj, PARAM_SERVER_PORT, ServerPort); obs_data_set_default_bool(obj, PARAM_LOCKTOIPV4, LockToIPv4); - obs_data_set_default_bool(obj, PARAM_CLIENT_ENABLE, ClientEnabled); + obs_data_set_default_bool(obj, PARAM_CLIENT_ENABLE, false); obs_data_set_default_string(obj, PARAM_ADDRESS, Address.c_str()); obs_data_set_default_int(obj, PARAM_CLIENT_PORT, ClientPort); obs_data_set_default_bool(obj, PARAM_CLIENT_SEND_SCENE_CHANGE, diff --git a/lib/macro/macro-properties.cpp b/lib/macro/macro-properties.cpp index ccf8dfa4..b93236ca 100644 --- a/lib/macro/macro-properties.cpp +++ b/lib/macro/macro-properties.cpp @@ -27,6 +27,9 @@ void MacroProperties::Save(obs_data_t *obj) const void MacroProperties::Load(obs_data_t *obj) { auto data = obs_data_get_obj(obj, "macroProperties"); + obs_data_set_default_bool(data, "highlightExecuted", true); + obs_data_set_default_bool(data, "highlightConditions", true); + obs_data_set_default_bool(data, "highlightActions", true); _highlightExecuted = obs_data_get_bool(data, "highlightExecuted"); _highlightConditions = obs_data_get_bool(data, "highlightConditions"); _highlightActions = obs_data_get_bool(data, "highlightActions");