Merge remote-tracking branch 'origin/master' into pairing-filter-regexp

piggz · Feb 7, 2025 · 4f1c9ba · 4f1c9ba
2 parents 4bc4d3d + d0508a6
commit 4f1c9ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/daemon/src/deviceinterface.cpp b/daemon/src/deviceinterface.cpp
@@ -945,14 +945,14 @@ void DeviceInterface::registerDBus()
         if (!connection.registerService(SERVICE))
         {
             qCritical() << Q_FUNC_INFO << "Unable to register service. Quit.";
-            QCoreApplication::quit();
+            exit(1);
             return;
         }
 
         if (!connection.registerObject(PATH, this, QDBusConnection::ExportAllInvokables | QDBusConnection::ExportAllSignals | QDBusConnection::ExportAllProperties))
         {
             qCritical() << Q_FUNC_INFO << "Unable to register objects. Quit.";
-            QCoreApplication::quit();
+            exit(1);
             return;
         }
         m_dbusRegistered = true;

diff --git a/daemon/src/services/mibandservice.cpp b/daemon/src/services/mibandservice.cpp
@@ -81,9 +81,9 @@ void MiBandService::characteristicChanged(const QString &characteristic, const Q
 
     if (characteristic == UUID_CHARACTERISTIC_MIBAND_DEVICE_EVENT) {
         if (value[0] == EVENT_DECLINE_CALL) {
-            emit serviceEvent(AbstractDevice::EVENT_DECLINE_CALL);
+            emit serviceEvent(EVENT_DECLINE_CALL);
         } else if (value[0] == EVENT_IGNORE_CALL) {
-            emit serviceEvent(AbstractDevice::EVENT_IGNORE_CALL);
+            emit serviceEvent(EVENT_IGNORE_CALL);
         } else if (value[0] == EVENT_BUTTON) {
             emit buttonPressed();
         } else if (value[0] == EVENT_MUSIC) {