From 2fdce7f63869ee691697be55b9407407a544bd3a Mon Sep 17 00:00:00 2001
From: Alexandre Gobbo <alexandre.gobbo@psi.ch>
Date: Thu, 14 Feb 2019 15:48:13 +0100
Subject: [PATCH] Included Diffcalc commands to the API of diffutils, and
 adapted to latest version.

---
 src/main/java/ch/psi/mxsc/Controller.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ch/psi/mxsc/Controller.java b/src/main/java/ch/psi/mxsc/Controller.java
index 72ac39c..82834ae 100644
--- a/src/main/java/ch/psi/mxsc/Controller.java
+++ b/src/main/java/ch/psi/mxsc/Controller.java
@@ -226,8 +226,14 @@ public class Controller {
             try {
                 currentMountedSample = (String) Context.getInstance().evalLineBackground("get_setting('mounted_sample_position')");
                 Sample sample = basePlate.getSampleByName(currentMountedSample);
+                if ((sample == null) && (roomTemperatureBasePlate!=null)){
+                    sample = roomTemperatureBasePlate.getSampleByName(currentMountedSample);
+                    roomTemperatureBasePlate.resetLoadedSample();
+                }
                 basePlate.resetLoadedSample();
-                sample.setLoaded(true);
+                if (sample != null) {
+                    sample.setLoaded(true);
+                }
             } catch (Exception ex) {
                 currentMountedSample = null;
                 basePlate.resetLoadedSample();