summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFrerich Raabe <raabe@froglogic.com>2016-04-04 12:16:42 +0200
committerKatja Marttila <katja.marttila@theqtcompany.com>2016-04-07 04:44:43 +0000
commit805e91ba4b73e28c30fc5e7a61e99774a3e9ae74 (patch)
tree3242046da9f83c390c2e8c9d669d23422921f41a /src
parent80d1eb3dd7a577b92663c9bcd00f2614e9bd0a73 (diff)
Fixed handling of Destroy command in server process
Destroying QProcess or QAbstractFileEngine objects never worked, since the code for deciding what type of object is to be destroyed confused the 'type' with the 'command'. Change-Id: I8d6c6bf2f11ff82cfbd744c43fcc91d234967b69 Reviewed-by: Katja Marttila <katja.marttila@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/libs/installer/remoteserverconnection.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/remoteserverconnection.cpp b/src/libs/installer/remoteserverconnection.cpp
index f87b638c6..665958bee 100644
--- a/src/libs/installer/remoteserverconnection.cpp
+++ b/src/libs/installer/remoteserverconnection.cpp
@@ -149,11 +149,11 @@ void RemoteServerConnection::run()
stream >> type;
if (type == QLatin1String(Protocol::QSettings)) {
settings.reset();
- } else if (command == QLatin1String(Protocol::QProcess)) {
+ } else if (type == QLatin1String(Protocol::QProcess)) {
m_signalReceiver->m_receivedSignals.clear();
m_process->deleteLater();
m_process = 0;
- } else if (command == QLatin1String(Protocol::QAbstractFileEngine)) {
+ } else if (type == QLatin1String(Protocol::QAbstractFileEngine)) {
delete m_engine;
m_engine = 0;
}