diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-08-15 15:41:06 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-15 19:53:48 +0100 |
| commit | 8af28edd4afad7116d2f8dbadc98cd88c031504d (patch) | |
| tree | 5ba8ed424b169ad3c6ff9b9aab43c721c17d5bba | |
| parent | 19b34d5dcfabb80e51b4b746ac57d2c6a8cfd94e (diff) | |
| download | qt3-8af28edd4afad7116d2f8dbadc98cd88c031504d.tar.gz qt3-8af28edd4afad7116d2f8dbadc98cd88c031504d.zip | |
Fix crash on exit when application does not use session management
This relates to Bug 1627
(cherry picked from commit 7c0bc39229bbba839dea93fe12b0d2cdbe21eec0)
| -rw-r--r-- | src/kernel/qapplication.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp index d11e6bd..01b10f5 100644 --- a/src/kernel/qapplication.cpp +++ b/src/kernel/qapplication.cpp @@ -1160,9 +1160,13 @@ QApplication::~QApplication() qDebug( "Widgets left: %i Max widgets: %i \n", QWidget::instanceCounter, QWidget::maxInstances ); } #ifndef QT_NO_SESSIONMANAGER - delete session_manager; + if ( session_manager ) { + delete session_manager; + } session_manager = 0; - delete session_key; + if ( session_key ) { + delete session_key; + } session_key = 0; #endif //QT_NO_SESSIONMANAGER |