w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feat-wspr-user-hardware

This commit is contained in:
Bill Somerville 2020-07-26 23:01:57 +01:00
parent 479484040b b0f76b2fe7
commit d1abed3bae
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Network/PSKReporter.cpp
View File

@ -14,7 +14,6 @@
#include <QUdpSocket>
#include <QTcpSocket>
#include <QHostInfo>
#include <QUDPSocket>
#include <QQueue>
#include <QByteArray>
#include <QDataStream>
@ -97,7 +96,7 @@ public:
{
// handle re-opening asynchronously
auto connection = QSharedPointer<QMetaObject::Connection>::create ();
*connection = connect (socket_.get (), &QAbstractSocket::disconnected, [this, connection] () {
*connection = connect (socket_.data (), &QAbstractSocket::disconnected, [this, connection] () {
qDebug () << "PSKReporter::impl::check_connection: disconnected, socket state:" << socket_->state ();
disconnect (*connection);
check_connection ();
@ -151,7 +150,7 @@ public:
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
connect (socket_.get (), &QAbstractSocket::errorOccurred, this, &PSKReporter::impl::handle_socket_error);
#else
connect (socket_.get (), QOverload<QAbstractSocket::SocketError>::of (&QAbstractSocket::error), this, &PSKReporter::impl::handle_socket_error);
connect (socket_.data (), QOverload<QAbstractSocket::SocketError>::of (&QAbstractSocket::error), this, &PSKReporter::impl::handle_socket_error);
#endif
// use this for pseudo connection with UDP, allows us to use