[evolution/gnome-3-24] Bug 720197 - [IMAPx] Indefinite waiting for message download ][

[Milan Crha <mcrha src gnome org>]

commit 1b3d8b0f8086a645be461696de087d5c5a636892
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue May 9 16:03:39 2017 +0200

    Bug 720197 - [IMAPx] Indefinite waiting for message download ][

 src/e-util/e-table-selection-model.c |    2 +-
 src/mail/message-list.c              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/e-util/e-table-selection-model.c b/src/e-util/e-table-selection-model.c
index c85ffd8..ecd591b 100644
--- a/src/e-util/e-table-selection-model.c
+++ b/src/e-util/e-table-selection-model.c
@@ -125,8 +125,8 @@ model_changed_idle (ETableSelectionModel *etsm)
                        g_free (save_id);
                }
                free_hash (etsm);
-               e_selection_model_cursor_changed (E_SELECTION_MODEL (etsm), cursor_row, cursor_col);
                e_selection_model_selection_changed (E_SELECTION_MODEL (etsm));
+               e_selection_model_cursor_changed (E_SELECTION_MODEL (etsm), cursor_row, cursor_col);
        }
        etsm->model_changed_idle_id = 0;
        return FALSE;
diff --git a/src/mail/message-list.c b/src/mail/message-list.c
index f5295b9..71ddf84 100644
--- a/src/mail/message-list.c
+++ b/src/mail/message-list.c
@@ -5146,7 +5146,7 @@ on_selection_changed_cmd (ETree *tree,
         * is also used for other updating.  If it is empty, it might just be a setup event
         * from etree which we do need to ignore */
        if ((newuid == NULL && message_list->cursor_uid == NULL && selected_count == 0) ||
-           (message_list->last_sel_single && selected_count == 1 && newuid != NULL && 
message_list->cursor_uid != NULL && !strcmp (message_list->cursor_uid, newuid))) {
+           (message_list->last_sel_single && selected_count == 1 && message_list->cursor_uid != NULL && 
(newuid == NULL || !strcmp (message_list->cursor_uid, newuid)))) {
                /* noop */
        } else {
                g_free (message_list->cursor_uid);