From 9010f4c294607cfb7947de00aa53ce8a6df21823 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Sat, 15 Sep 2012 18:56:30 -0400 Subject: [PATCH] in trashMessageSelected(), don't crash if there is no currentFolder. BUG: 306862 FIXED-IN: 4.9.2 --- kmmainwidget.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp index 174facf8a..7e3321801 100644 --- a/kmmainwidget.cpp +++ b/kmmainwidget.cpp @@ -2192,6 +2192,10 @@ void KMMainWidget::copySelectedMessagesToFolder( const Akonadi::Collection& dest // void KMMainWidget::trashMessageSelected( MessageList::Core::MessageItemSetReference ref ) { + if ( !mCurrentFolder ) { + return; + } + const QList select = mMessagePane->itemListFromPersistentSet( ref ); mMessagePane->markMessageItemsAsAboutToBeRemoved( ref, true ); @@ -3987,7 +3991,7 @@ void KMMainWidget::updateMessageActionsDelayed() } const qint64 nbMsgOutboxCollection = MailCommon::Util::updatedCollection( CommonKernel->outboxCollectionFolder() ).statistics().count(); - + actionCollection()->action( "send_queued" )->setEnabled( nbMsgOutboxCollection > 0 ); actionCollection()->action( "send_queued_via" )->setEnabled( nbMsgOutboxCollection > 0 ); @@ -4174,7 +4178,7 @@ void KMMainWidget::updateFolderMenu() bool imapFolderIsOnline = false; if(mCurrentFolder && kmkernel->isImapFolder( mCurrentFolder->collection(),imapFolderIsOnline )) { if(imapFolderIsOnline) { - actionlist << mServerSideSubscription; + actionlist << mServerSideSubscription; } }