Permalink
Browse files

Merge pull request #7444 from tdz/bug-828174

Bug 828174: Track Bluetooth discovery state in Settings app [r=ehung]
  • Loading branch information...
2 parents 2b8b03b + 82e96a0 commit 51b3c17e5528b39d83f11d0ffd255f3ef05b4eb8 @vingtetun vingtetun committed Jan 10, 2013
Showing with 2 additions and 2 deletions.
  1. +2 −2 apps/settings/js/bluetooth.js
View
4 apps/settings/js/bluetooth.js
@@ -593,7 +593,7 @@ onLocalized(function bluetoothSettings() {
}
function startDiscovery() {
- if (!bluetooth.enabled || !defaultAdapter)
+ if (!bluetooth.enabled || !defaultAdapter || discoverTimeout)
return;
var req = defaultAdapter.startDiscovery();
@@ -616,7 +616,7 @@ onLocalized(function bluetoothSettings() {
}
function stopDiscovery() {
- if (!bluetooth.enabled || !defaultAdapter)
+ if (!bluetooth.enabled || !defaultAdapter || !discoverTimeout)
return;
var req = defaultAdapter.stopDiscovery();
req.onsuccess = function bt_discoveryStopped() {

0 comments on commit 51b3c17

Please sign in to comment.