Skip to content

Commit 7ae88f7

Browse files
committed
Reset invalid transition behaviour settings
1 parent ae70af2 commit 7ae88f7

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/general.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,10 +655,9 @@ void SwitcherData::saveGeneralSettings(obs_data_t *obj)
655655

656656
obs_data_set_bool(obj, "tansitionOverrideOverride",
657657
transitionOverrideOverride);
658-
obs_data_set_default_bool(obj, "adjustActiveTransitionType",
659-
adjustActiveTransitionType);
660658
obs_data_set_bool(obj, "adjustActiveTransitionType",
661659
adjustActiveTransitionType);
660+
662661
obs_data_set_string(obj, "lastImportPath", lastImportPath.c_str());
663662
}
664663

@@ -741,6 +740,12 @@ void SwitcherData::loadGeneralSettings(obs_data_t *obj)
741740
adjustActiveTransitionType =
742741
obs_data_get_bool(obj, "adjustActiveTransitionType");
743742

743+
if (!transitionOverrideOverride && !adjustActiveTransitionType) {
744+
blog(LOG_INFO,
745+
"reset transition behaviour to adjust active transition type");
746+
adjustActiveTransitionType = true;
747+
}
748+
744749
lastImportPath = obs_data_get_string(obj, "lastImportPath");
745750
}
746751

0 commit comments

Comments
 (0)