From 9a05e2ec5f049cf7d64ce1fa028cde2bf6d6e164 Mon Sep 17 00:00:00 2001
From: Paolo Possanzini <paolo@teamdev.it>
Date: Thu, 29 Mar 2018 09:35:08 +0200
Subject: [PATCH] fix

---
 Step.Config/Config/serverConfig.xml                           | 4 ++--
 Step/wwwroot/src/modules/under-the-hood/jog-menu.vue          | 2 +-
 Step/wwwroot/src/modules/under-the-hood/process-selection.vue | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Step.Config/Config/serverConfig.xml b/Step.Config/Config/serverConfig.xml
index 9ed5e08e..1f8b8d8a 100644
--- a/Step.Config/Config/serverConfig.xml
+++ b/Step.Config/Config/serverConfig.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <serverConfig>
   <ncConfig>
-    <ncVendor>OSAI</ncVendor> <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI -->
+    <ncVendor>DEMO</ncVendor> <!-- NO_NC/DEMO/FANUC/SIEMENS/OSAI -->
     <showNcHMI>true</showNcHMI>
-    <ncIpAddress>192.168.157.2</ncIpAddress>
+    <ncIpAddress>127.0.0.1</ncIpAddress>
     <ncPort>8080</ncPort>
     <machineModel>Ares 37 OF</machineModel>
   </ncConfig>
diff --git a/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue b/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
index 534ee939..048c049f 100644
--- a/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
+++ b/Step/wwwroot/src/modules/under-the-hood/jog-menu.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="jog-menu" ref="menu">
-    <button @click="toggleAxes()" :class="{active:showAxesMenu}" class="soft">{{"jog_menu_asse_x" | localize("Asse")}} {{getAxesName()}}</button>
+    <button @click="toggleAxes()" :class="{active:showAxesMenu}" :disabled="axes.length == 0" class="soft">{{"jog_menu_asse_x" | localize("Asse")}} {{getAxesName()}}</button>
     <div class="btn-spacer">
       <button @click="ncClick(23)" :disabled="!isKeyActive(23)" :class="{active:isKeySelected(23) , inverted:isReadOnly(23)}" class="soft square"><i class="fa fa-minus"></i></button>
       <button v-if="!machineInfo.isSiemens" @click="ncClick(24)" :disabled="!isKeyActive(24)" :class="{active:isKeySelected(24) , inverted:isReadOnly(24)}" class="soft">{{"jog_menu_rapid" | localize("Rapid")}}</button>
diff --git a/Step/wwwroot/src/modules/under-the-hood/process-selection.vue b/Step/wwwroot/src/modules/under-the-hood/process-selection.vue
index e3cd2d40..e29bb65a 100644
--- a/Step/wwwroot/src/modules/under-the-hood/process-selection.vue
+++ b/Step/wwwroot/src/modules/under-the-hood/process-selection.vue
@@ -20,6 +20,7 @@ export default {
   },
   methods: {
     selectProcess: function(id) {
+      if(this.selectProcess != id)
       Hub.Current.selectProcess(id);
     }
   }