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

Merge origin/master

Browse Source
This commit is contained in:
gac-S_Changer
2019-02-28 16:40:16 +01:00
parent e2ce88fefb ae42bc26a4
commit d558687827
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/ch/psi/mxsc/Controller.java
View File

@@ -8,7 +8,7 @@ import ch.psi.pshell.core.Context;
import ch.psi.pshell.core.DevicePool;
import ch.psi.pshell.core.DevicePoolListener;
import ch.psi.pshell.core.JsonSerializer;
import ch.psi.pshell.device.Device;
import ch.psi.pshell.device.Device;
import ch.psi.pshell.device.DeviceAdapter;
import ch.psi.pshell.device.DeviceListener;
import ch.psi.pshell.device.GenericDevice;
@@ -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();
@@ -694,7 +700,7 @@ public class Controller {
void playSound(String name){
try{
Audio.playFile(new File(Context.getInstance().getSetup().expandPath("{home}/sounds/" + name + ".wav")));
Audio.playFile(new File(Context.getInstance().getSetup().expandPath("{home}/sounds/" + name + ".wav")), false);
} catch (Exception ex){
Logger.getLogger(Controller.class.getName()).log(Level.FINE, null, ex);
}