From 4d55e3d01c1c75a979ad6f53ac18648fc90c6934 Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Sat, 12 Jul 2014 01:13:04 +0200 Subject: Reworked PebbledInterface DBus handling --- daemon/manager.cpp | 1 - daemon/watchconnector.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'daemon') diff --git a/daemon/manager.cpp b/daemon/manager.cpp index c045c1b..8ff6785 100644 --- a/daemon/manager.cpp +++ b/daemon/manager.cpp @@ -24,7 +24,6 @@ Manager::Manager(watch::WatchConnector *watch, DBusConnector *dbus, VoiceCallMan connect(voice, SIGNAL(activeVoiceCallChanged()), SLOT(onActiveVoiceCallChanged())); connect(voice, SIGNAL(error(const QString &)), SLOT(onVoiceError(const QString &))); - // Watch instantiated hangup, follow the orders connect(watch, SIGNAL(hangup()), SLOT(hangupAll())); connect(watch, SIGNAL(connectedChanged()), SLOT(onConnectedChanged())); diff --git a/daemon/watchconnector.cpp b/daemon/watchconnector.cpp index d0fcdad..088384d 100644 --- a/daemon/watchconnector.cpp +++ b/daemon/watchconnector.cpp @@ -176,11 +176,11 @@ void WatchConnector::onDisconnected() bool was_connected = is_connected; is_connected = false; + if (was_connected) emit connectedChanged(); + QBluetoothSocket *socket = qobject_cast(sender()); if (!socket) return; - if (was_connected) emit connectedChanged(); - socket->deleteLater(); reconnectTimer.setInterval(reconnectTimer.interval() + __reconnect_timeout); -- cgit v1.2.3