From 293409b39cd077d5b404686f0c8ce8e94707a6d7 Mon Sep 17 00:00:00 2001 From: jtc42 Date: Fri, 7 Jun 2019 16:35:26 +0100 Subject: [PATCH] Account for server version being undefined in old releases --- src/components/paneConnect.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/paneConnect.vue b/src/components/paneConnect.vue index 20130840..e0bfc337 100644 --- a/src/components/paneConnect.vue +++ b/src/components/paneConnect.vue @@ -132,14 +132,17 @@ export default { checkServerVersion: function () { this.$store.dispatch('updateState') .then (() => { - console.log(this.$store.state.apiState.version) - var serverVersion = this.$store.state.apiState.version - var serverVersionMajor = serverVersion.substring(0, 3) - console.log(serverVersionMajor) var clientVersion = process.env.PACKAGE_VERSION var clientVersionMajor = clientVersion.substring(0, 3) console.log(clientVersionMajor) - if (serverVersionMajor != clientVersionMajor) { + + var serverVersion = this.$store.state.apiState.version + if (serverVersion != undefined) { + var serverVersionMajor = serverVersion.substring(0, 3) + } + console.log(serverVersionMajor) + + if ((serverVersion == undefined) || (serverVersionMajor != clientVersionMajor)) { this.modalDialog("Version mismatch", "Client and microscope versions do not match. Consider updating your microscope software. Some functionality may currently be broken.", status='warning') } })