diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-22 01:00:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-22 01:00:14 +0200 |
| commit | 999ba23946352a0ae4afd5e18f38a44851121b56 (patch) | |
| tree | 652083a09b51caa0981a09b206142297e4159ee6 /src/network | |
| parent | 591edbb11c73a51d5d6657ef4e3b585d556d7c68 (diff) | |
| parent | 2fe80ed203672977e5a00addb224be052bf81cca (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Id32f0ae002772444c0b61cd132ef81f96fe3b895
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/ssl/qsslsocket_winrt.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_winrt.cpp b/src/network/ssl/qsslsocket_winrt.cpp index 53a8a8b61b..e72edcbc52 100644 --- a/src/network/ssl/qsslsocket_winrt.cpp +++ b/src/network/ssl/qsslsocket_winrt.cpp @@ -647,6 +647,10 @@ HRESULT QSslSocketBackendPrivate::onSslUpgrade(IAsyncAction *action, AsyncStatus connectionEncrypted = true; emit q->encrypted(); + // The write buffer may already have data written to it, so we need to call transmit. + // This has to be done in 'q's thread, and not in the current thread (the XAML thread). + QMetaObject::invokeMethod(q, [this](){ transmit(); }); + if (pendingClose) { pendingClose = false; q->disconnectFromHost(); |