From c060a817e492351d3097b9d84f80c9b17690342a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 25 Jul 2013 13:05:22 -0500 Subject: Do not show logout status dialog if the user has turned it off in their configuration --- ksmserver/shutdown.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index 41556dcf2..d09383fcd 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -257,10 +257,12 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm, shutdownMode = sdmode; bootOption = bopt; shutdownNotifierIPDlg = 0; - shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP(); - if (shutdownNotifierIPDlg) { - static_cast(shutdownNotifierIPDlg)->setStatusMessage(i18n("Notifying applications of logout request...")); - notificationTimer.start( KSMSERVER_NOTIFICATION_MANUAL_OPTIONS_TIMEOUT, true ); + if (showLogoutStatusDlg) { + shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP(); + if (shutdownNotifierIPDlg) { + static_cast(shutdownNotifierIPDlg)->setStatusMessage(i18n("Notifying applications of logout request...")); + notificationTimer.start( KSMSERVER_NOTIFICATION_MANUAL_OPTIONS_TIMEOUT, true ); + } } // shall we save the session on logout? -- cgit v1.2.1