anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix(scanner): fix a bug which can cause the scanner to remain active indefinitely

Browse source 
fixes #4967
This commit is contained in:
Jason Dreyzehner 2017-01-20 09:09:36 -05:00
commit b31719dbeb
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/js/controllers/tab-scan.js
View file

@ -81,6 +81,8 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
handleSuccessfulScan(contents); handleSuccessfulScan(contents);
} }
}); });
// resume preview if paused
scannerService.resumePreview();
}); });
}); });
} }
@ -103,7 +105,6 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
} }
$rootScope.$on('incomingDataMenu.menuHidden', function() { $rootScope.$on('incomingDataMenu.menuHidden', function() {
scannerService.resumePreview();
activate(); activate();
}); });

2
src/js/services/scannerService.js
View file

@ -129,7 +129,7 @@ angular.module('copayApp.services').service('scannerService', function($log, $ti
var nextHide = null; var nextHide = null;
var nextDestroy = null; var nextDestroy = null;
var hideAfterSeconds = 7; var hideAfterSeconds = 5;
var destroyAfterSeconds = 60; var destroyAfterSeconds = 60;
/** /**