From 309f0b6c9325e868d48ac82274a2694beb15be2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@guh.io>
Date: Thu, 22 Nov 2018 11:02:08 +0100
Subject: [PATCH] Register DBus type properly

---
 libnymea-networkmanager/networkconnection.cpp | 1 +
 libnymea-networkmanager/networkconnection.h   | 1 +
 nymea-networkmanager/core.cpp                 | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/libnymea-networkmanager/networkconnection.cpp b/libnymea-networkmanager/networkconnection.cpp
index d398b1c..a10e23c 100644
--- a/libnymea-networkmanager/networkconnection.cpp
+++ b/libnymea-networkmanager/networkconnection.cpp
@@ -30,6 +30,7 @@ NetworkConnection::NetworkConnection(const QDBusObjectPath &objectPath, QObject
     QObject(parent),
     m_objectPath(objectPath)
 {
+    qRegisterMetaType<ConnectionSettings>("ConnectionSettings");
     qDBusRegisterMetaType<ConnectionSettings>();
 
     m_connectionInterface = new QDBusInterface(NetworkManagerUtils::networkManagerServiceString(), m_objectPath.path(), NetworkManagerUtils::connectionsInterfaceString(), QDBusConnection::systemBus(), this);
diff --git a/libnymea-networkmanager/networkconnection.h b/libnymea-networkmanager/networkconnection.h
index 3669d38..7bbff9f 100644
--- a/libnymea-networkmanager/networkconnection.h
+++ b/libnymea-networkmanager/networkconnection.h
@@ -60,6 +60,7 @@ private:
     ConnectionSettings m_connectionSettings;
 };
 
+Q_DECLARE_METATYPE(ConnectionSettings)
 QDebug operator<<(QDebug debug, NetworkConnection *networkConnection);
 
 #endif // NETWORKCONNECTION_H
diff --git a/nymea-networkmanager/core.cpp b/nymea-networkmanager/core.cpp
index 3743b2d..656f3a8 100644
--- a/nymea-networkmanager/core.cpp
+++ b/nymea-networkmanager/core.cpp
@@ -174,6 +174,12 @@ void Core::evaluateNetworkManagerState(const NetworkManager::NetworkManagerState
     if (m_mode != ModeOffline)
         return;
 
+    // Note: if the wireless device is in the access point mode, the bluetooth server should stop
+    if (m_wirelessDevice->mode() == WirelessNetworkDevice::ModeAccessPoint) {
+        stopService();
+        return;
+    }
+
     switch (state) {
     case NetworkManager::NetworkManagerStateConnectedGlobal:
         // We are online