[geary/geary-0.13] Merge branch 'wip/251-appended-mail-closes-composer' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 5adf778829da7675824197fe9ee7e289221b474b
Author: Michael Gratton <mike vee net>
Date:   Thu Feb 21 12:59:26 2019 +0000

    Merge branch 'wip/251-appended-mail-closes-composer' into 'master'
    
    Appended mail closes composer
    
    Closes #251
    
    See merge request GNOME/geary!131
    
    (cherry picked from commit 3cb3b3a9329cfd53a224ff404dc4f974f0356e40)
    
    b7c849f3 Fix composer being hidden when autoselect disabled and mail appended

 src/client/application/geary-controller.vala | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index 499b5d99..dda2a490 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -1217,10 +1217,13 @@ public class GearyController : Geary.BaseObject {
                 enable_message_buttons(false);
             } else {
                 // When not doing autoselect, we never get
-                // conversations_selected firing from the convo list, so
-                // we need to stop the loading spinner here
+                // conversations_selected firing from the convo list,
+                // so we need to stop the loading spinner here. Only
+                // do so if there isn't already a selection or a
+                // composer to avoid interrupting those.
                 if (!this.application.config.autoselect &&
-                    list.get_selection().count_selected_rows() == 0) {
+                    list.get_selection().count_selected_rows() == 0 &&
+                    !viewer.is_composer_visible) {
                     viewer.show_none_selected();
                     enable_message_buttons(false);
                 }