From 2ac643b520781cf6a1c0da6330c1a8f6aa9b5a91 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Tue, 15 Mar 2016 11:17:56 -0400
Subject: [PATCH] #1443: code review

---
 platform/chromium/vapi-client.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/platform/chromium/vapi-client.js b/platform/chromium/vapi-client.js
index 6e455e4bb..835e9cbba 100644
--- a/platform/chromium/vapi-client.js
+++ b/platform/chromium/vapi-client.js
@@ -211,18 +211,20 @@ vAPI.messaging = {
             this.disconnectListenerCallback = this.disconnectListener.bind(this);
             this.portPollerCallback = this.portPoller.bind(this);
         }
-        var port = null;
         try {
-            port = this.port = chrome.runtime.connect({name: vAPI.sessionId});
-            port.onMessage.addListener(this.messageListenerCallback);
-            port.onDisconnect.addListener(this.disconnectListenerCallback);
+            this.port = chrome.runtime.connect({name: vAPI.sessionId}) || null;
         } catch (ex) {
+            this.port = null;
+        }
+        if ( this.port !== null ) {
+            this.port.onMessage.addListener(this.messageListenerCallback);
+            this.port.onDisconnect.addListener(this.disconnectListenerCallback);
         }
         this.portTimerDelay = 10000;
         if ( this.portTimer === null ) {
             this.portTimer = vAPI.setTimeout(this.portPollerCallback, this.portTimerDelay);
         }
-        return port;
+        return this.port;
     },
 
     connect: function() {
@@ -330,7 +332,7 @@ vAPI.messaging = {
 
 vAPI.shutdown.add(function() {
     vAPI.messaging.shutdown();
-    window.vAPI = null;
+    delete window.vAPI;
 });
 
 // https://www.youtube.com/watch?v=rT5zCHn0tsg