summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 21:02:01 +0000
committerbryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 21:02:01 +0000
commit910875d9a35955b0e51d150c40879eb892250155 (patch)
tree1413d19ae730fbf8b720eb5381b9c7b3b48798ee
parentba0adf0687f075e8658b470068c9341fc56143c9 (diff)
downloadchromium_src-910875d9a35955b0e51d150c40879eb892250155.zip
chromium_src-910875d9a35955b0e51d150c40879eb892250155.tar.gz
chromium_src-910875d9a35955b0e51d150c40879eb892250155.tar.bz2
Fix a bug where a callback was being called twice.
Previously this was calling the result callback for ConnectToService twice, once with a socket and once with NULL. TEST=manually BUG=none Review URL: https://chromiumcodereview.appspot.com/10433005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139632 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/bluetooth/bluetooth_device.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_device.cc b/chrome/browser/chromeos/bluetooth/bluetooth_device.cc
index e696d0d..aec96a3 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_device.cc
+++ b/chrome/browser/chromeos/bluetooth/bluetooth_device.cc
@@ -487,7 +487,7 @@ void BluetoothDevice::ConnectToMatchingService(
BluetoothSocket::CreateBluetoothSocket(service_record));
if (socket.get() != NULL) {
callback.Run(socket);
- break;
+ return;
}
}
}