From 6bcfee48403053c12dab7f97148f208dc1c7e6a6 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@nokia.com>
Date: Thu, 8 Oct 2009 15:21:37 +0200
Subject: [PATCH] Trk: Closing TrkDevice when Launcher emits finished()
Reviewed-by: Friedemann Kleint
---
src/shared/trk/launcher.cpp | 1 +
src/shared/trk/trkdevice.cpp | 2 +-
src/shared/trk/trkdevice.h | 4 +++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/shared/trk/launcher.cpp b/src/shared/trk/launcher.cpp
index bae9c37e9b4..3d808b22245 100644
--- a/src/shared/trk/launcher.cpp
+++ b/src/shared/trk/launcher.cpp
@@ -76,6 +76,7 @@ Launcher::Launcher(Actions startupActions) :
{
d->m_startupActions = startupActions;
connect(&d->m_device, SIGNAL(messageReceived(trk::TrkResult)), this, SLOT(handleResult(trk::TrkResult)));
+ connect(this, SIGNAL(finished()), &d->m_device, SLOT(close()));
}
Launcher::~Launcher()
diff --git a/src/shared/trk/trkdevice.cpp b/src/shared/trk/trkdevice.cpp
index c7ebe792b7b..7aee9bf00e9 100644
--- a/src/shared/trk/trkdevice.cpp
+++ b/src/shared/trk/trkdevice.cpp
@@ -893,7 +893,7 @@ bool TrkDevice::open(const QString &port, QString *errorMessage)
Qt::QueuedConnection);
connect(d->readerThread.data(), SIGNAL(messageReceived(trk::TrkResult,QByteArray)),
this, SLOT(slotMessageReceived(trk::TrkResult,QByteArray)),
- Qt::BlockingQueuedConnection);
+ Qt::QueuedConnection);
d->readerThread->start();
d->writerThread = QSharedPointer<WriterThread>(new WriterThread(d->deviceContext));
diff --git a/src/shared/trk/trkdevice.h b/src/shared/trk/trkdevice.h
index 579d32acf3b..632dea1b24b 100644
--- a/src/shared/trk/trkdevice.h
+++ b/src/shared/trk/trkdevice.h
@@ -73,7 +73,6 @@ public:
bool open(const QString &port, QString *errorMessage);
bool isOpen() const;
- void close();
QString errorString() const;
@@ -109,6 +108,9 @@ protected slots:
void emitError(const QString &msg);
void emitLogMessage(const QString &msg);
+public slots:
+ void close();
+
private:
void readMessages();
TrkDevicePrivate *d;
--
GitLab