diff options
author | Katja Marttila <katja.marttila@qt.io> | 2017-03-27 07:28:57 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2017-03-30 04:35:45 +0000 |
commit | cd063bc1bd2765080127045b4601f0082f413d6d (patch) | |
tree | 2395cd7a2a2e3e35c6eddf800a768332f83f991c /src | |
parent | a474d0ba7c981864fbb4b2fb0e34fd8f024209a5 (diff) |
Fix crash at the very end of install if admin rights needed in Windows
Removed the destroy call to RemoteClientPrivate object as that has been
destroyed at that point already in packagemanagercore destructor
Task-number: QTIFW-943
Change-Id: Ibb7b4f00842d780b32055dbdc3673d031c52a89a
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/installer/remoteobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/installer/remoteobject.cpp b/src/libs/installer/remoteobject.cpp index 1ae9e6a41..49c111610 100644 --- a/src/libs/installer/remoteobject.cpp +++ b/src/libs/installer/remoteobject.cpp @@ -51,7 +51,8 @@ RemoteObject::~RemoteObject() { if (m_socket) { if (QThread::currentThread() == m_socket->thread()) { - writeData(QLatin1String(Protocol::Destroy), m_type, dummy, dummy); + if (m_type != QLatin1String("RemoteClientPrivate")) + writeData(QLatin1String(Protocol::Destroy), m_type, dummy, dummy); } else { Q_ASSERT_X(false, Q_FUNC_INFO, "Socket running in a different Thread than this object."); } |