[evolution/gnome-3-26] Bug 789526 - Incorrect message selected after Delete in real Trash folder

[Milan Crha <mcrha src gnome org>]

commit e1bfa5512e7b4f7315d2014dc4641561df46b6b2
Author: Milan Crha <mcrha redhat com>
Date:   Thu Nov 16 15:39:29 2017 +0100

    Bug 789526 - Incorrect message selected after Delete in real Trash folder

 src/mail/message-list.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/mail/message-list.c b/src/mail/message-list.c
index da715fb..9b3fd14 100644
--- a/src/mail/message-list.c
+++ b/src/mail/message-list.c
@@ -6139,10 +6139,12 @@ message_list_regen_done_cb (GObject *source_object,
 
                e_table_item_thaw (table_item);
 
-               if (!saveuid && message_list->cursor_uid && g_hash_table_lookup (message_list->uid_nodemap, 
message_list->cursor_uid)) {
+               if ((!saveuid || !g_hash_table_lookup (message_list->uid_nodemap, saveuid)) &&
+                   message_list->cursor_uid && g_hash_table_lookup (message_list->uid_nodemap, 
message_list->cursor_uid)) {
                        /* this makes sure a visible node is selected, like when
                         * collapsing all nodes and a children had been selected
-                       */
+                        */
+                       g_free (saveuid);
                        saveuid = g_strdup (message_list->cursor_uid);
                }