From 84f2b6a4731aaa43d6a553853e7f17cde13a10b2 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Mon, 11 Jan 2021 22:48:23 +0100
Subject: [PATCH] bugfix: switching printers in remoteMode change to single
 mode

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/plugins/wsClient.js     | 1 -
 src/store/actions.js        | 8 ++++++--
 src/store/server/actions.js | 4 +++-
 src/store/socket/actions.js | 1 -
 src/store/socket/getters.js | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/plugins/wsClient.js b/src/plugins/wsClient.js
index 12e64942..4a1c6de2 100644
--- a/src/plugins/wsClient.js
+++ b/src/plugins/wsClient.js
@@ -58,7 +58,6 @@ export default class WebSocketClient {
 
         this.instance.onclose = (e) => {
             this.passToStore('socket/onClose', e)
-            window.console.log("reconnectInterval: "+this.reconnectInterval)
 
             if (!e.wasClean && this.reconnects < this.maxReconnects) {
                 this.reconnects++
diff --git a/src/store/actions.js b/src/store/actions.js
index d8be8a32..961ed071 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -8,17 +8,21 @@ export default {
         router.push("/");
     },
 
-    changePrinter({ dispatch, getters }, payload) {
+    changePrinter({ dispatch, getters, state }, payload) {
+        const remoteMode = state.socket.remoteMode
+
         dispatch('files/reset')
         dispatch('gui/reset')
         dispatch('printer/reset')
+        dispatch('server/reset')
         dispatch('socket/reset')
 
         const printerSocket = getters["farm/"+payload.printer+"/getSocketData"]
 
         dispatch('socket/setSocket', {
             hostname: printerSocket.hostname,
-            port: printerSocket.port
+            port: printerSocket.port,
+            remoteMode: remoteMode,
         })
     }
 }
diff --git a/src/store/server/actions.js b/src/store/server/actions.js
index e5c25b30..a2cf081e 100644
--- a/src/store/server/actions.js
+++ b/src/store/server/actions.js
@@ -1,8 +1,10 @@
 import Vue from 'vue'
 
 export default {
-	reset({ commit }) {
+	reset({ commit, dispatch }) {
 		commit('reset')
+		dispatch('power/reset')
+		dispatch('updateManager/reset')
 	},
 
 	init({ dispatch, state }) {
diff --git a/src/store/socket/actions.js b/src/store/socket/actions.js
index af9b1344..76d64fa6 100644
--- a/src/store/socket/actions.js
+++ b/src/store/socket/actions.js
@@ -26,7 +26,6 @@ export default {
 
 	onClose ({ commit }, event) {
 		commit('setDisconnected');
-		window.console.log(event)
 
 		if (event.wasClean) window.console.log('Socket closed clear')
 	},
diff --git a/src/store/socket/getters.js b/src/store/socket/getters.js
index 470ccb39..c5ffca6b 100644
--- a/src/store/socket/getters.js
+++ b/src/store/socket/getters.js
@@ -1,6 +1,6 @@
 export default {
 
 	getUrl: state => {
-		return "//" + state.hostname + (state.port === 80 ? ":"+state.port : "")
+		return "//" + state.hostname + (state.port !== 80 ? ":"+state.port : "")
 	}
 }
\ No newline at end of file