pshell/MXSC
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gobbo_a
2019-02-14 15:48:13 +01:00
parent eaec82dd86
commit 2fdce7f638
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/ch/psi/mxsc/Controller.java
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();