[evolution] I#562 - Mail message list sometimes doesn't scroll to cursor after regen

[Milan Crha <mcrha src gnome org>]

commit b06105e2221c109240d226e7733cd2ab71891586
Author: Milan Crha <mcrha redhat com>
Date:   Mon Aug 19 17:03:28 2019 +0200

    I#562 - Mail message list sometimes doesn't scroll to cursor after regen
    
    Closes https://gitlab.gnome.org/GNOME/evolution/issues/562

 src/mail/message-list.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/src/mail/message-list.c b/src/mail/message-list.c
index 84be2004f7..98c07c6c85 100644
--- a/src/mail/message-list.c
+++ b/src/mail/message-list.c
@@ -6895,9 +6895,10 @@ mail_regen_list (MessageList *message_list,
 
        new_regen_data = regen_data_new (message_list, cancellable);
        new_regen_data->search = g_strdup (search);
-       new_regen_data->folder_changed = folder_changes != NULL;
+       /* Make sure the folder_changes won't reset currently running regen, which would scroll to the 
selection in the UI */
+       new_regen_data->folder_changed = folder_changes != NULL && (!old_regen_data || 
old_regen_data->folder_changed);
 
-       if (folder_changes && folder_changes->uid_removed) {
+       if (folder_changes && folder_changes->uid_removed && new_regen_data->folder_changed) {
                guint ii;
 
                new_regen_data->removed_uids = g_hash_table_new_full (g_direct_hash, g_direct_equal, 
(GDestroyNotify) camel_pstring_free, NULL);