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();