1 files changed, 17 insertions, 0 deletions
diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index 24f3aa52..f72a4af6 100755
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -217,6 +217,18 @@ static void pan_connect_cb(DBusMessage *message, void *user_data)
 		return;
 	}
 
+#ifdef TIZEN_EXT
+	/*
+	 * Network could be removed because of BT adapter power off
+	 * This is to handle the scenario where network is removed
+	 * before the connect_cb is called
+	 */
+	if (!pan->network) {
+		DBG("network already removed");
+		return;
+	}
+#endif
+
 	if (dbus_message_get_type(message) == DBUS_MESSAGE_TYPE_ERROR) {
 		const char *dbus_error = dbus_message_get_error_name(message);
 
@@ -535,7 +547,10 @@ static void device_enable_cb(const DBusError *error, void *user_data)
 		goto out;
 	}
 
+#if !defined TIZEN_EXT
 	enable_device(device, path);
+#endif
+
 out:
 	g_free(path);
 }
@@ -602,7 +617,9 @@ static void device_disable_cb(const DBusError *error, void *user_data)
 		goto out;
 	}
 
+#if !defined TIZEN_EXT
 	disable_device(device, path);
+#endif
 
 out:
 	g_free(path);