Core update

RobotExMachina · Dec 20, 2018 · 7e412de · 7e412de
1 parent 2b7891f
commit 7e412de
Show file tree

Hide file tree

Showing 4 changed files with 132 additions and 23 deletions.
diff --git a/dist/nightly/Machina.dll b/dist/nightly/Machina.dll
diff --git a/dist/nightly/Machina.xml b/dist/nightly/Machina.xml
diff --git a/dist/nightly/MachinaBridge.exe b/dist/nightly/MachinaBridge.exe
diff --git a/src/MachinaBridge/MainWindow.xaml.cs b/src/MachinaBridge/MainWindow.xaml.cs
@@ -415,7 +415,7 @@ internal void UpdateRobotStatus()
                 Machina.MotionType mtype = bot.GetCurrentMotionMode();
                 lbl_Status_MotionMode_Value.Content = mtype.ToString();
 
-                lbl_Status_Tool_Value.Content = bot.GetCurrentTool().name;
+                lbl_Status_Tool_Value.Content = bot.GetCurrentTool()?.name ?? "(no tool)";
 
             }, null);
         }