Merge pull request #266 from daserge/multiple-focus-3

[Windows] Focus fails on multiple taps
phonegap · Jun 23, 2016 · d92af72 · d92af72
2 parents 78a5345 + f18ed1a
commit d92af72
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/windows/BarcodeScannerProxy.js b/src/windows/BarcodeScannerProxy.js
@@ -344,7 +344,16 @@ module.exports = {
             return WinJS.Promise.timeout(INITIAL_FOCUS_DELAY)
             .then(function () {
                 try {
-                    return controller.focusControl.focusAsync();
+                    return controller.focusControl.focusAsync().then(function () {
+                        return result;
+                    }, function (e) {
+                        // This happens on mutliple taps
+                        if (e.number !== OPERATION_IS_IN_PROGRESS) {
+                            console.error('focusAsync failed: ' + e);
+                            return WinJS.Promise.wrapError(e);
+                        }
+                        return result;
+                    });
                 } catch (e) {
                     // This happens on mutliple taps
                     if (e.number !== OPERATION_IS_IN_PROGRESS) {