Merge pull request #18 from BSensory/master

Prevent stopScan to be called on timeout
randdusing · Jun 1, 2016 · c703845 · c703845
2 parents a120383 + ff6502f
commit c703845
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/ng-cordova-bluetoothle.js b/ng-cordova-bluetoothle.js
@@ -61,14 +61,18 @@ angular.module('ngCordovaBluetoothLE', []).factory('$cordovaBluetoothLE', ['$q',
       var timeout = null;
       if (params.scanTimeout) {
         timeout = $timeout(function() {
-          window.bluetoothle.stopScan(
-            function(obj) {
-              q.resolve(obj);
-            },
-            function(obj) {
-              q.reject(obj);
+          window.bluetoothle.isScanning(function(obj) {
+            if (obj.isScanning) {
+              window.bluetoothle.stopScan(
+                function(obj) {
+                  q.resolve(obj);
+                },
+                function(obj) {
+                  q.reject(obj);
+                }
+              );
             }
-          );
+          });
         }, params.scanTimeout);
       }