OSDN Git Service
(root)
/
android-x86
/
external-bluetooth-bluez.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2ea895e
)
core: Ensure that adapter->discoverable default is false
author
Marcel Holtmann
<marcel@holtmann.org>
Wed, 19 Dec 2012 16:48:08 +0000
(17:48 +0100)
committer
Marcel Holtmann
<marcel@holtmann.org>
Wed, 19 Dec 2012 16:48:08 +0000
(17:48 +0100)
src/adapter.c
patch
|
blob
|
history
diff --git
a/src/adapter.c
b/src/adapter.c
index
144975c
..
5539d55
100644
(file)
--- a/
src/adapter.c
+++ b/
src/adapter.c
@@
-2601,7
+2601,12
@@
static void load_config(struct btd_adapter *adapter)
/* Get discoverable mode */
adapter->discoverable = g_key_file_get_boolean(key_file, "General",
- "Discoverable", NULL);
+ "Discoverable", &gerr);
+ if (gerr) {
+ adapter->discoverable = FALSE;
+ g_error_free(gerr);
+ gerr = NULL;
+ }
/* Get discoverable timeout */
adapter->discov_timeout = g_key_file_get_integer(key_file, "General",