From 5becd80fe9d1286692648ec5956106e569c1bbec Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Wed, 11 Mar 2015 13:31:05 -0700
Subject: [PATCH] Show an error if a conversation window fails to init

I saw this happen once. Seems to be a race condition.
---
 js/conversation_panel.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/js/conversation_panel.js b/js/conversation_panel.js
index 2083689fe..4d99d0647 100644
--- a/js/conversation_panel.js
+++ b/js/conversation_panel.js
@@ -22,9 +22,13 @@
     extension.windows.getCurrent(function (windowInfo) {
         var bg = extension.windows.getBackground();
         var conversation = bg.getConversationForWindow(windowInfo.id);
-        window.document.title = conversation.getTitle();
-        new Whisper.ConversationView({
-            model: conversation
-        }).$el.prependTo($('body'));
+        if (conversation) {
+            window.document.title = conversation.getTitle();
+            new Whisper.ConversationView({
+                model: conversation
+            }).$el.prependTo($('body'));
+        } else {
+            $('<div>').text('Error').prependTo($('body'));
+        }
     });
 }());