diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-08 01:00:08 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-08 01:00:08 +0200 |
| commit | 2b38408cbc23816034f087779d351f4db2ee4b1b (patch) | |
| tree | c97a6881875331c7ef4b9aecf896434071382a46 /src/corelib/thread/qthread_win.cpp | |
| parent | 0ea7360eaa70c2b024a37b2ff9106531440cdee7 (diff) | |
| parent | 36cc171b9314bf77fc84d4273dceb6264aef7134 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I4c0fd501db974fb8339944b8df845336776d80a9
Diffstat (limited to 'src/corelib/thread/qthread_win.cpp')
| -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 e56fe2c6ae..5c7642c26e 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(); } |