From 2a91260a6c7f35cb9e22b1e5695606c3d7295269 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 2 Oct 2018 16:27:41 +0200 Subject: [PATCH] Fix Coverity #1372351 --- src/folderview.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/folderview.c b/src/folderview.c index 246ab3c68..03a63c733 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -3185,23 +3185,21 @@ static void folderview_drag_received_cb(GtkWidget *widget, src_item && src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL)) { return; } - if (item && src_item) { - switch (gdk_drag_context_get_selected_action(drag_context)) { - case GDK_ACTION_COPY: + + switch (gdk_drag_context_get_selected_action(drag_context)) { + case GDK_ACTION_COPY: + summary_copy_selected_to(folderview->summaryview, item); + gtk_drag_finish(drag_context, TRUE, FALSE, time); + break; + case GDK_ACTION_MOVE: + case GDK_ACTION_DEFAULT: + default: + if (FOLDER_CLASS(src_item->folder)->remove_msg == NULL) summary_copy_selected_to(folderview->summaryview, item); - gtk_drag_finish(drag_context, TRUE, FALSE, time); - break; - case GDK_ACTION_MOVE: - case GDK_ACTION_DEFAULT: - default: - if (FOLDER_CLASS(src_item->folder)->remove_msg == NULL) - summary_copy_selected_to(folderview->summaryview, item); - else - summary_move_selected_to(folderview->summaryview, item); - gtk_drag_finish(drag_context, TRUE, TRUE, time); - } - } else - gtk_drag_finish(drag_context, FALSE, FALSE, time); + else + summary_move_selected_to(folderview->summaryview, item); + gtk_drag_finish(drag_context, TRUE, TRUE, time); + } } else { /* comes from folderview */ char *source; -- 2.25.1