diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-13 09:46:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-13 10:20:13 +0200 |
| commit | 275ad4ce4cc568c5bb07c00dcffb28a096d45c2b (patch) | |
| tree | 883f978cb9479614a016be485862c9f62e9f2f0a /src/corelib/thread | |
| parent | 42d32e468aa89631161884f07b3e25814c47b879 (diff) | |
| parent | 1dade1bd8ad13a16152aff36351ac570b5b9fdf6 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qthread_win.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp index f8a0b0abaa..a72df2fc40 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -99,6 +99,8 @@ void qt_create_tls() return; static QBasicMutex mutex; QMutexLocker locker(&mutex); + if (qt_current_thread_data_tls_index != TLS_OUT_OF_INDEXES) + return; qt_current_thread_data_tls_index = TlsAlloc(); } |