OSDN Git Service

de-inline if condition in QThread::setTerminationEnabled()
authorIvailo Monev <xakepa10@laimg.moc>
Fri, 19 Jun 2020 18:49:03 +0000 (18:49 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Fri, 19 Jun 2020 18:49:03 +0000 (18:49 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
src/core/thread/qthread_unix.cpp

index 1168f5a..4634133 100644 (file)
@@ -482,9 +482,12 @@ void QThread::setTerminationEnabled(bool enabled)
     Q_ASSERT_X(currentThread() != Q_NULLPTR, "QThread::setTerminationEnabled()",
                "Current thread was not started with QThread.");
 
-    pthread_setcancelstate(enabled ? PTHREAD_CANCEL_ENABLE : PTHREAD_CANCEL_DISABLE, Q_NULLPTR);
-    if (enabled)
+    if (enabled) {
+        pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, Q_NULLPTR);
         pthread_testcancel();
+    } else {
+        pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, Q_NULLPTR);
+    }
 }
 
 void QThread::setPriority(Priority priority)