Browse Source

refactor(coreav): simplify start sequence

(cherry picked from commit c332cc0cca)
reviewable/pr6021/r1
sudden6 6 years ago committed by Anthony Bilinski
parent
commit
cf402bd11c
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
  1. 8
      src/core/coreav.cpp

8
src/core/coreav.cpp

@ -86,8 +86,7 @@ CoreAV::CoreAV(std::unique_ptr<ToxAV, ToxAVDeleter> toxav)
connect(iterateTimer, &QTimer::timeout, this, &CoreAV::process); connect(iterateTimer, &QTimer::timeout, this, &CoreAV::process);
connect(coreavThread.get(), &QThread::finished, iterateTimer, &QTimer::stop); connect(coreavThread.get(), &QThread::finished, iterateTimer, &QTimer::stop);
connect(coreavThread.get(), &QThread::started, this, &CoreAV::process);
coreavThread->start();
} }
void CoreAV::connectCallbacks(ToxAV& toxav) void CoreAV::connectCallbacks(ToxAV& toxav)
@ -164,10 +163,7 @@ CoreAV::~CoreAV()
*/ */
void CoreAV::start() void CoreAV::start()
{ {
// Timers can only be touched from their own thread coreavThread->start();
if (QThread::currentThread() != coreavThread.get())
return (void)QMetaObject::invokeMethod(this, "start", Qt::BlockingQueuedConnection);
iterateTimer->start();
} }
void CoreAV::process() void CoreAV::process()

Loading…
Cancel
Save