summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2019-05-17 12:56:21 +0200
committerBernd Weimer <bernd.weimer@pelagicore.com>2019-08-01 13:21:25 +0200
commitc5db47a7b53c5800a3af6a6f2f79925ba3a71c57 (patch)
tree3748688dc890e972516051cd807f75fad3ebb4b4
parent0cb42db5bb3ff97f1549ef3053ef5685b8dc5e9c (diff)
Fix applications reusing a runtime object that is about to be destructed
Cherry-picked from dev: d1ac8c9 Change-Id: I784772e66afe55434297b89669d2555318887dde Task-number: AUTOSUITE-925 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
-rw-r--r--src/manager-lib/nativeruntime.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/manager-lib/nativeruntime.cpp b/src/manager-lib/nativeruntime.cpp
index 3283a923..c5786ffd 100644
--- a/src/manager-lib/nativeruntime.cpp
+++ b/src/manager-lib/nativeruntime.cpp
@@ -234,8 +234,11 @@ void NativeRuntime::shutdown(int exitCode, Am::ExitStatus status)
emit applicationDisconnectedFromPeerDBus(connection, application());
emit finished(exitCode, status);
- setState(Am::NotRunning);
+ if (m_app)
+ m_app->setCurrentRuntime(nullptr);
+
+ setState(Am::NotRunning);
deleteLater();
}