sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-24 12:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid hang on closing webcam due to rescans for new camera devices

Browse source
This commit is contained in:
Craig Raw 2021-07-04 19:18:02 +02:00
parent f691f1691e
commit 2f153686dd
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/com/sparrowwallet/sparrow/control/WebcamScanDriver.java
View file

@ -8,15 +8,21 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class WebcamScanDriver extends WebcamDefaultDriver { public class WebcamScanDriver extends WebcamDefaultDriver {
private List<WebcamDevice> foundScanDevices;
@Override @Override
public List<WebcamDevice> getDevices() { public List<WebcamDevice> getDevices() {
List<WebcamDevice> devices = super.getDevices(); if(foundScanDevices == null || foundScanDevices.isEmpty()) {
List<WebcamDevice> scanDevices = new ArrayList<>(); List<WebcamDevice> devices = super.getDevices();
for(WebcamDevice device : devices) { List<WebcamDevice> scanDevices = new ArrayList<>();
WebcamDefaultDevice defaultDevice = (WebcamDefaultDevice)device; for(WebcamDevice device : devices) {
scanDevices.add(new WebcamScanDevice(defaultDevice.getDeviceRef())); WebcamDefaultDevice defaultDevice = (WebcamDefaultDevice)device;
scanDevices.add(new WebcamScanDevice(defaultDevice.getDeviceRef()));
}
foundScanDevices = scanDevices;
} }
return scanDevices; return foundScanDevices;
} }
} }