Don't create a threaded delay

This fixes TelepathyIM#1 and fixes ubports/ubuntu-touch#860
ubports · Oct 17, 2019 · 468ec12 · 468ec12
1 parent e2f4439
commit 468ec12
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/ofonocallchannel.cpp b/ofonocallchannel.cpp
@@ -341,10 +341,9 @@ void oFonoCallChannel::onOfonoCallStateChanged(const QString &state)
         }
         mCallChannel->setCallState(Tp::CallStateEnded, 0, reason, stateDetails);
         // just in case, leave the channel opened for one more second before unregistering from bus
-        QTimer::singleShot(1000, [=]() {
-            Q_EMIT closed();
-            mBaseChannel->close();
-        });
+        QThread::msleep(1000);
+        Q_EMIT closed();
+        mBaseChannel->close();
     } else if (state == "active") {
         qDebug() << "active";
         mHoldIface->setHoldState(Tp::LocalHoldStateUnheld, Tp::LocalHoldStateReasonNone);

diff --git a/ofonoconferencecallchannel.cpp b/ofonoconferencecallchannel.cpp
@@ -120,9 +120,8 @@ void oFonoConferenceCallChannel::onChannelSplitted(const QDBusObjectPath &path)
 
         mCallChannel->setCallState(Tp::CallStateEnded, 0, reason, stateDetails);
         // just in case, delay the channel closing by 1 second
-        QTimer::singleShot(1000, [=]() {
-            mBaseChannel->close();
-        });
+        QThread::msleep(1000);
+        mBaseChannel->close();
     }
 }