From e48d1b254ea14a3679fc40e241cf80176343fca1 Mon Sep 17 00:00:00 2001
From: Samuel Mannehed <samuel@cendio.se>
Date: Tue, 8 Nov 2016 16:27:31 +0100
Subject: [PATCH] Separate state actions from connection actions

---
 core/rfb.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/rfb.js b/core/rfb.js
index e253f0b2..d83b691d 100644
--- a/core/rfb.js
+++ b/core/rfb.js
@@ -361,6 +361,7 @@
 
         _connect: function () {
             Util.Debug(">> RFB.connect");
+            this._init_vars();
 
             var uri;
             if (typeof UsingSocketIO !== 'undefined') {
@@ -373,6 +374,7 @@
             Util.Info("connecting to " + uri);
 
             try {
+                // WebSocket.onopen transitions to the RFB init states
                 this._sock.open(uri, this._wsProtocols);
             } catch (e) {
                 if (e.name === 'SyntaxError') {
@@ -504,9 +506,6 @@
                     break;
 
                 case 'connecting':
-                    this._init_vars();
-
-                    // WebSocket.onopen transitions to the RFB init states
                     this._connect();
                     break;