summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-06-10 07:58:27 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-06-10 07:58:27 +0200
commit4850d635d12826712e8b5e6fcaf94285700ab4f2 (patch)
treead9c0a21adce19242040581bcf733151472c78eb
parent259d6a6a6849c171b689a6ec1ada70c017a4f1ff (diff)
tracker/hatire: fix threading warningopentrack-2.3-rc49p2
It allows for direct connection now.
-rw-r--r--tracker-hatire/thread.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tracker-hatire/thread.cpp b/tracker-hatire/thread.cpp
index 629d1bff..4ffbf095 100644
--- a/tracker-hatire/thread.cpp
+++ b/tracker-hatire/thread.cpp
@@ -93,12 +93,6 @@ hatire_thread::~hatire_thread()
hatire_thread::hatire_thread()
{
data_read.reserve(65536);
-
- connect(this, &QThread::finished, this, &hatire_thread::teardown_serial);
- connect(this, &hatire_thread::init_serial_port, this, &hatire_thread::init_serial_port_impl, Qt::QueuedConnection);
- connect(this, &hatire_thread::serial_info, this, &hatire_thread::serial_info_impl, Qt::QueuedConnection);
- connect(this, &hatire_thread::sendcmd, this, &hatire_thread::sendcmd_impl, Qt::QueuedConnection);
- connect(this, &hatire_thread::sendcmd_str, this, &hatire_thread::sendcmd_str_impl, Qt::QueuedConnection);
}
void hatire_thread::teardown_serial()
@@ -128,6 +122,12 @@ void hatire_thread::teardown_serial()
void hatire_thread::run()
{
+ connect(this, &QThread::finished, this, &hatire_thread::teardown_serial);
+ connect(this, &hatire_thread::init_serial_port, this, &hatire_thread::init_serial_port_impl);
+ connect(this, &hatire_thread::serial_info, this, &hatire_thread::serial_info_impl);
+ connect(this, &hatire_thread::sendcmd, this, &hatire_thread::sendcmd_impl);
+ connect(this, &hatire_thread::sendcmd_str, this, &hatire_thread::sendcmd_str_impl);
+
#ifdef HATIRE_DEBUG_LOGFILE
com_port.setFileName(HATIRE_DEBUG_LOGFILE);
com_port.open(QIODevice::ReadOnly);