diff options
author | Eike Ziller <eike.ziller@qt.io> | 2017-11-08 09:40:38 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2017-11-08 11:11:02 +0000 |
commit | 2baf1630441810e206c8c12e6f06417e8eadb5fc (patch) | |
tree | 9cb897422fda4a9b0c69b887b9a592094952a068 /src | |
parent | 13050683750683b172cec0e2fb31282a3b7ed505 (diff) |
UpdateInfo: Fix crash on close while searching for updates
The ShellCommand deletes itself if run asynchronously, and it also
cancels itself when ICore sends coreAboutToClose, so we must be prepared
for it to vanish at any time.
Task-number: QTCREATORBUG-19165
Change-Id: I6d6a737ea529012976a623f812f2c426518557fd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/updateinfo/updateinfoplugin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index c1ffa97577..7e0e2f9d7e 100644 --- a/src/plugins/updateinfo/updateinfoplugin.cpp +++ b/src/plugins/updateinfo/updateinfoplugin.cpp @@ -42,6 +42,7 @@ #include <QMenu> #include <QMessageBox> #include <QMetaEnum> +#include <QPointer> #include <QProcessEnvironment> #include <QTimer> #include <QtPlugin> @@ -68,7 +69,7 @@ public: { } QString m_maintenanceTool; - ShellCommand *m_checkUpdatesCommand = 0; + QPointer<ShellCommand> m_checkUpdatesCommand; QString m_collectedOutput; QTimer *m_checkUpdatesTimer = 0; |