Included Diffcalc commands to the API of diffutils, and adapted to latest version.

This commit is contained in:
gobbo_a committed 2019-02-14 15:48:13 +01:00
1 parent eaec82dd86
commit 2fdce7f638
1 file changed
+7 -1
+7 -1
View File
@@ -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();