oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ensure effects are in the main thread

Browse Source
This commit is contained in:
itsmattkc
2019-03-13 00:35:51 +11:00
parent 101b728c19
commit db29e9e576
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
io/loadthread.cpp
+3 -1
View File
@@ -140,18 +140,20 @@ void LoadThread::load_effect(QXmlStreamReader& stream, Clip* c) {
EffectPtr ve(new VoidEffect(c, effect_name)); EffectPtr ve(new VoidEffect(c, effect_name));
ve->SetEnabled(effect_enabled); ve->SetEnabled(effect_enabled);
ve->load(stream); ve->load(stream);
ve->moveToThread(QApplication::instance()->thread());
c->effects.append(ve); c->effects.append(ve);
} else { } else {
EffectPtr e(Effect::Create(c, meta)); EffectPtr e(Effect::Create(c, meta));
e->SetEnabled(effect_enabled); e->SetEnabled(effect_enabled);
e->load(stream); e->load(stream);
e->moveToThread(QApplication::instance()->thread());
c->effects.append(e); c->effects.append(e);
} }
} else { } else {
TransitionPtr t = Transition::Create(c, nullptr, meta); TransitionPtr t = Transition::Create(c, nullptr, meta);
if (effect_length > -1) t->set_length(effect_length); if (effect_length > -1) t->set_length(effect_length);
t->SetEnabled(effect_enabled); t->SetEnabled(effect_enabled);
t->moveToThread(QApplication::instance()->thread());
t->load(stream); t->load(stream);
if (type == kTransitionOpening) { if (type == kTransitionOpening) {