Merge pull request mozilla-b2g#6879 from evelynhung/issue-818690

bug 818690 don't try to stop discover mode when bluetooth is disabling.
dscravag · Dec 7, 2012 · 4e94433 · 4e94433
2 parents 33536a0 + 566bf2f
commit 4e94433
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/apps/settings/js/bluetooth.js b/apps/settings/js/bluetooth.js
@@ -288,7 +288,9 @@ onLocalized(function bluetoothSettings() {
         enableMsg.hidden = false;
         searchingItem.hidden = true;
         optionMenu.close();
-        stopDiscovery();
+        // clear discoverTimeout
+        clearTimeout(discoverTimeout);
+        discoverTimeout = null;
       }
     }
 
@@ -544,7 +546,7 @@ onLocalized(function bluetoothSettings() {
     }
 
     function stopDiscovery() {
-      if (!defaultAdapter)
+      if (!defaultAdapter || !bluetooth.enabled)
         return;
       var req = defaultAdapter.stopDiscovery();
       req.onsuccess = function bt_discoveryStopped() {