summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-08-15 15:41:06 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-08-15 15:41:06 -0500
commit7c0bc39229bbba839dea93fe12b0d2cdbe21eec0 (patch)
tree342efcada0f6649361275e5d3a0a1ae5068c00f4 /src
parentaf5bc055c269f2685f13f3614bcf9f17349efc95 (diff)
downloadqt3-7c0bc39229bbba839dea93fe12b0d2cdbe21eec0.tar.gz
qt3-7c0bc39229bbba839dea93fe12b0d2cdbe21eec0.zip
Fix crash on exit when application does not use session management
This relates to Bug 1627
Diffstat (limited to 'src')
-rw-r--r--src/kernel/qapplication.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 2a89a90..ec01281 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -1241,9 +1241,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