From 3d8aa3b8a2979f88f5493b4751545a1d7071c019 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Mon, 28 Aug 2017 14:01:51 -0700
Subject: [PATCH] Export: Handle synchronous 'shutdown-complete' event (already
 offline)

FREEBIE
---
 js/views/migration_view.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/views/migration_view.js b/js/views/migration_view.js
index 9993b9567..af885a5e3 100644
--- a/js/views/migration_view.js
+++ b/js/views/migration_view.js
@@ -142,11 +142,7 @@
       this.render();
     },
     beginMigration: function() {
-      // tells MessageReceiver to disconnect and drain its queue, will fire
-      //   'shutdown-complete' event when that is done.
-      Whisper.Migration.init();
-
-      Whisper.events.on('shutdown-complete', function() {
+      Whisper.events.once('shutdown-complete', function() {
         Whisper.Migration.beginExport()
           .then(this.completeMigration.bind(this))
           .catch(this.onError.bind(this));
@@ -155,6 +151,11 @@
         this.render();
       }.bind(this));
 
+      // tells MessageReceiver to disconnect and drain its queue, will fire
+      //   'shutdown-complete' event when that is done. Might result in a synchronous
+      //   event, so call it after we register our callback.
+      Whisper.Migration.init();
+
       // Rendering because we're now in the 'disconnected' state
       this.render();
     },