From 38152042d514cd5b08e2e34fc68886f991ab2689 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Fri, 29 Sep 2017 09:58:37 -0700
Subject: [PATCH] Ensure final message before 'empty' is ready for notification
 (#1522)

Without this change, there's a race condition for the notification we
show when we get the 'empty' event after a large backlog download. Four
messages may have come in, but the last might not be notified. So the
count shown would be three. And then, when the final message's notify()
call finishes, another notification would be shown.

FREEBIE
---
 js/models/messages.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index c13e05625..b2101b429 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -493,12 +493,16 @@
                                         //   because we need to start expiration timers, etc.
                                         message.markRead();
                                     }
+
                                     if (message.get('unread')) {
-                                        conversation.notify(message);
+                                        conversation.notify(message).then(function() {
+                                            confirm();
+                                            return resolve();
+                                        }, handleError);
+                                    } else {
+                                        confirm();
+                                        return resolve();
                                     }
-
-                                    confirm();
-                                    return resolve();
                                 }
                                 catch (e) {
                                     handleError(e);