From d597460042d6de567b119031fa1178f445697b14 Mon Sep 17 00:00:00 2001 From: guiserrato Date: Thu, 6 Nov 2014 14:24:13 -0800 Subject: [PATCH] Fix for issue #148 --- src/windows8/BarcodeScannerProxy.js | 8 ++++++-- src/windows8/lib/WinRTBarcodeReader.winmd | Bin 11776 -> 12288 bytes .../WinRTBarcodeReader/Reader.cs | 14 ++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/windows8/BarcodeScannerProxy.js b/src/windows8/BarcodeScannerProxy.js index 9384214a3..e0a1b59f7 100644 --- a/src/windows8/BarcodeScannerProxy.js +++ b/src/windows8/BarcodeScannerProxy.js @@ -20,6 +20,7 @@ module.exports = { var capturePreview = null, captureCancelButton = null, + captureCanceled = false, capture = null, captureSettings = null, reader = null, @@ -74,8 +75,10 @@ module.exports = { reader = new WinRTBarcodeReader.Reader(capture, bitmapWidth, bitmapHeight); var readOp = reader.readCode(); readOp.done(function (result) { - destroyPreview(); - success({ text: result.text, format: result.barcodeFormat, cancelled: false }); + if (!captureCanceled) { + destroyPreview(); + success({ text: result.text, format: result.barcodeFormat, cancelled: false }); + } }); } @@ -105,6 +108,7 @@ module.exports = { * See https://github.com/phonegap-build/BarcodeScanner#using-the-plugin */ function cancelPreview() { + captureCanceled = true; destroyPreview(); success({ text: null, format: null, cancelled: true }); } diff --git a/src/windows8/lib/WinRTBarcodeReader.winmd b/src/windows8/lib/WinRTBarcodeReader.winmd index 91c415c5a0ddb9d27c8b834a99682709a4eed6ff..d57ed806c191869513a1b5681388ba8895a304ea 100644 GIT binary patch delta 4595 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 HK(qB9U?+m= diff --git a/src/windows8/lib/WinRTBarcodeReader/WinRTBarcodeReader/Reader.cs b/src/windows8/lib/WinRTBarcodeReader/WinRTBarcodeReader/Reader.cs index bc4cec0f4..3a52d755a 100644 --- a/src/windows8/lib/WinRTBarcodeReader/WinRTBarcodeReader/Reader.cs +++ b/src/windows8/lib/WinRTBarcodeReader/WinRTBarcodeReader/Reader.cs @@ -108,16 +108,18 @@ public void Stop() private async Task Read() { Result result = null; - while (!this.barcodeFound) + try { - try + while (!this.barcodeFound) { + result = await this.GetCameraImage(this.cancelSearch.Token); + } - catch (OperationCanceledException) - { - result = null; - } + } + catch (OperationCanceledException) + { + result = null; } return result;