pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Startup

Browse Source
This commit is contained in:
gobbo_a
2016-11-11 11:18:14 +01:00
parent b2ebcb8f67
commit 2eff2eddf3
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/ScreenPanel.java
View File

@@ -273,6 +273,13 @@ public class ScreenPanel extends Panel {
model.addElement(prefix);
}
}
if (App.hasArgument("cam")) {
String cam = App.getArgumentValue("cam");
if (model.getIndexOf(cam)<0){
model.addElement(cam);
}
}
comboCameras.setModel(model);
comboCameras.setEnabled(true);
comboCameras.setSelectedItem(-1);
@@ -422,7 +429,7 @@ public class ScreenPanel extends Panel {
}
try {
Path configFile = Paths.get(configFolder, cameraName + ".json");
cameraConfigJson = new String(Files.readAllBytes(configFile));
cameraConfigJson = configFile.toFile().exists() ? new String(Files.readAllBytes(configFile)) : null;
this.cameraName = cameraName;
try {
if (buttonCamtool.isSelected()) {