feature/default_network_editable
David Walsh 4 years ago
parent 15654b3d0b
commit 9987484301
  1. 18
      ui/app/components/app/modals/qr-scanner/qr-scanner.component.js

@ -104,14 +104,14 @@ export default class QrScanner extends Component {
componentWillUnmount () {
this.mounted = false
clearTimeout(this.permissionChecker)
this.teardownCodeReader();
this.teardownCodeReader()
}
teardownCodeReader() {
if(this.codeReader) {
this.codeReader.reset();
this.codeReader.stop();
this.codeReader = null;
teardownCodeReader () {
if (this.codeReader) {
this.codeReader.reset()
this.codeReader.stop()
this.codeReader = null
}
}
@ -121,12 +121,12 @@ export default class QrScanner extends Component {
// once we receive permission so that the video displays.
// It's important to prevent this codeReader from being created twice;
// Firefox otherwise starts 2 video streams, one of which cannot be stopped
if(!this.codeReader) {
if (!this.codeReader) {
this.codeReader = new BrowserQRCodeReader()
}
try {
await this.codeReader.getVideoInputDevices()
this.checkPermissions();
this.checkPermissions()
const content = await this.codeReader.decodeFromInputVideoDevice(undefined, 'video')
const result = this.parseContent(content.text)
if (!this.mounted) {
@ -176,7 +176,7 @@ export default class QrScanner extends Component {
stopAndClose = () => {
if (this.codeReader) {
this.teardownCodeReader();
this.teardownCodeReader()
}
this.props.hideModal()
}

Loading…
Cancel
Save