sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2025-11-05 11:56:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

save webcam device unique id instead of name to config

Browse source
This commit is contained in:
Craig Raw 2025-07-10 08:15:00 +02:00
parent 3c5fa58a16
commit 80105aee62
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java
View file

@ -188,7 +188,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
} }
}); });
webcamDeviceProperty.addListener((_, _, newValue) -> { webcamDeviceProperty.addListener((_, _, newValue) -> {
Config.get().setWebcamDevice(newValue.getName()); Config.get().setWebcamDevice(newValue.getUniqueId());
if(!Objects.equals(webcamService.getDevice(), newValue)) { if(!Objects.equals(webcamService.getDevice(), newValue)) {
webcamService.cancel(); webcamService.cancel();
} }

4
src/main/java/com/sparrowwallet/sparrow/control/WebcamService.java
View file

@ -144,6 +144,10 @@ public class WebcamService extends ScheduledService<Image> {
} }
} else if(Config.get().getWebcamDevice() != null) { } else if(Config.get().getWebcamDevice() != null) {
for(CaptureDevice webcam : availableDevices) { for(CaptureDevice webcam : availableDevices) {
if(webcam.getUniqueId().equals(Config.get().getWebcamDevice())) {
selectedDevice = webcam;
break;
}
if(webcam.getName().equals(Config.get().getWebcamDevice())) { if(webcam.getName().equals(Config.get().getWebcamDevice())) {
selectedDevice = webcam; selectedDevice = webcam;
break; break;