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

forced thread safety on media throbber

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