diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-06-18 11:38:32 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-06-18 11:38:32 +0200 |
| commit | 494ac6a035c0c6f4a77118663ebd1abf92072339 (patch) | |
| tree | d3ea28fc93d6b08e47c97711d2308eb1588d9064 | |
| parent | e60eab99fcd031f2766ae7790a2db084615c2500 (diff) | |
tracker/hatire: reduce diff to rc49p1opentrack-2.3-rc49p3
| -rw-r--r-- | tracker-hatire/thread.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tracker-hatire/thread.cpp b/tracker-hatire/thread.cpp index 8a4b5f12..b77b1ac1 100644 --- a/tracker-hatire/thread.cpp +++ b/tracker-hatire/thread.cpp @@ -122,11 +122,11 @@ 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); + connect(this, &QThread::finished, this, &hatire_thread::teardown_serial, Qt::DirectConnection); + 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); #ifdef HATIRE_DEBUG_LOGFILE com_port.setFileName(HATIRE_DEBUG_LOGFILE); @@ -135,7 +135,7 @@ void hatire_thread::run() read_timer.start(10); connect(&read_timer, &QTimer::timeout, this, &hatire_thread::on_serial_read, Qt::DirectConnection); #else - connect(&com_port, &serial_t::readyRead, this, &hatire_thread::on_serial_read); + connect(&com_port, &serial_t::readyRead, this, &hatire_thread::on_serial_read, Qt::DirectConnection); #endif (void) exec(); |