From db29e9e576fc4da75ff855be4f91d6620d962fa9 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 13 Mar 2019 00:35:51 +1100 Subject: [PATCH] ensure effects are in the main thread --- io/loadthread.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/io/loadthread.cpp b/io/loadthread.cpp index 8c66718c2..0a7fd561a 100644 --- a/io/loadthread.cpp +++ b/io/loadthread.cpp @@ -140,18 +140,20 @@ 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); if (type == kTransitionOpening) {