diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-04 11:18:35 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-04-04 12:20:10 +0000 |
| commit | 2ca6d76ee8ea8445c0b28973abefba512ed94289 (patch) | |
| tree | 17f8a7f5465deaf831aad4bf3df246939750256e | |
| parent | 2505982e9bbe5a8fc9b664530b243461750a6877 (diff) | |
Launcher socket: Replace an assertion with a proper check
Calls to sendData() can legitimately come in even after the socket has
failed, because the potential callers live in a different thread.
Change-Id: I6bfdf20e723ebe089bb9e49d294ae434eefeabbc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/lib/corelib/tools/launchersocket.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/corelib/tools/launchersocket.cpp b/src/lib/corelib/tools/launchersocket.cpp index 69b431c7e..d72ce278b 100644 --- a/src/lib/corelib/tools/launchersocket.cpp +++ b/src/lib/corelib/tools/launchersocket.cpp @@ -58,7 +58,8 @@ LauncherSocket::LauncherSocket(QObject *parent) : QObject(parent) void LauncherSocket::sendData(const QByteArray &data) { - QBS_ASSERT(m_socket, return); + if (!isReady()) + return; std::lock_guard<std::mutex> locker(m_requestsMutex); m_requests << data; if (m_requests.count() == 1) |