Skip to content

Commit 01c5987

Browse files
committed
Allow transition bar Action to ignore hold time
1 parent bfb7b0e commit 01c5987

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/actions/mmg-action-transitions.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ MMGParams<int32_t> MMGActionTransitionsTBar::tbar_params {
184184

185185
MMGParams<int32_t> MMGActionTransitionsTBar::held_duration_params {
186186
.desc = mmgtr("Actions.Transitions.HeldDuration"),
187-
.options = OPTION_NONE,
187+
.options = OPTION_ALLOW_IGNORE,
188188
.default_value = 1000,
189189
.lower_bound = 10.0,
190190
.upper_bound = 5000.0,
@@ -205,7 +205,7 @@ MMGActionTransitionsTBar::MMGActionTransitionsTBar(MMGActionManager *parent, con
205205
void MMGActionTransitionsTBar::initOldData(const QJsonObject &json_obj)
206206
{
207207
MMGCompatibility::initOldNumberData(tbar, json_obj, "num", 1);
208-
held_duration = 1000;
208+
held_duration.changeTo<STATE_IGNORE>();
209209
}
210210

211211
void MMGActionTransitionsTBar::json(QJsonObject &json_obj) const
@@ -242,7 +242,7 @@ void MMGActionTransitionsTBar::execute(const MMGMappingTest &test) const
242242
"Position field and try again.");
243243

244244
runInMainThread([=, this]() {
245-
tbar_timer.restart(held_duration);
245+
if (held_duration->state() == STATE_FIXED) tbar_timer.restart(held_duration);
246246
obs_frontend_set_tbar_position(tbar_dst);
247247
});
248248
}

0 commit comments

Comments
 (0)