From 66ee11f572972796398b5cb541398ee754cc0995 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@nokia.com>
Date: Wed, 19 Apr 2006 16:39:48 +0000
Subject: Store device mode settings

---
 hcid/dbus.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'hcid/dbus.c')

diff --git a/hcid/dbus.c b/hcid/dbus.c
index cd864215..3f99c272 100644
--- a/hcid/dbus.c
+++ b/hcid/dbus.c
@@ -339,7 +339,7 @@ static gboolean register_dbus_path(const char *path, uint16_t path_id, uint16_t
 	data->path_id = path_id;
 	data->dev_id = dev_id;
 	data->mode = SCAN_DISABLED;
-	data->discoverable_timeout = DFT_DISCOVERABLE_TIMEOUT;
+	data->discoverable_timeout = get_discoverable_timeout(dev_id);
 
 	if (fallback) {
 		if (!dbus_connection_register_fallback(connection, path, pvtable, data)) {
@@ -1695,6 +1695,8 @@ void hcid_dbus_setscan_enable_complete(bdaddr_t *local)
 		goto failed;
 	}
 
+	write_device_mode(local, scan_mode);
+
 	message = dbus_message_new_signal(path, ADAPTER_INTERFACE,
 						"ModeChanged");
 	if (message == NULL) {
-- 
cgit