From 9bb221a5ee8e137b0a8a510176ec5f8978714163 Mon Sep 17 00:00:00 2001
From: Paul Sprakes <kdecvs@sprakes.co.uk>
Date: Fri, 3 Sep 2004 13:06:04 +0000
Subject: [PATCH] Fix bug 71821. If message selection is empty use current
 message when forwarding.

svn path=/trunk/kdepim/; revision=343707
---
 kmmainwidget.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index 3ee29b0e4..dd4896132 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -1177,8 +1177,14 @@ void KMMainWidget::slotMessageQueuedOrDrafted()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotForwardMsg()
 {
-  KMCommand *command =
-    new KMForwardCommand( this, *mHeaders->selectedMsgs(), mFolder->identity() );
+  KMMessageList* selected = mHeaders->selectedMsgs();
+  KMCommand *command = 0L;
+  if(selected && !selected->isEmpty()) {
+    command = new KMForwardCommand( this, *selected, mFolder->identity() );
+  } else {
+    command = new KMForwardCommand( this, mHeaders->currentMsg(), mFolder->identity() );
+  }
+    
   command->start();
 }
 
@@ -1186,8 +1192,14 @@ void KMMainWidget::slotForwardMsg()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotForwardAttachedMsg()
 {
-  KMCommand *command =
-    new KMForwardAttachedCommand( this, *mHeaders->selectedMsgs(), mFolder->identity() );
+  KMMessageList* selected = mHeaders->selectedMsgs();
+  KMCommand *command = 0L;
+  if(selected && !selected->isEmpty()) {
+    command = new KMForwardAttachedCommand( this, *selected, mFolder->identity() );
+  } else {
+    command = new KMForwardAttachedCommand( this, mHeaders->currentMsg(), mFolder->identity() );
+  }
+    
   command->start();
 }