w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-24 13:18:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix merging issue

Browse Source
This commit is contained in:
Bill Somerville 2020-07-26 15:55:17 +01:00
parent 7bb5a8e009
commit 1f524026f9
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Network/MessageClient.cpp
View File

@ -428,24 +428,22 @@ MessageClient::MessageClient (QString const& id, QString const& version, QString
{
connect (&*m_
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect (&*m_, static_cast<void (impl::*) (impl::SocketError)> (&impl::error)
, [this] (impl::SocketError e) {
, static_cast<void (impl::*) (impl::SocketError)> (&impl::error), [this] (impl::SocketError e)
#else
connect (&*m_, &impl::errorOccurred, [this] (impl::SocketError e) {
, &impl::errorOccurred, [this] (impl::SocketError e)
#endif
{
#if defined (Q_OS_WIN)
// take this out when Qt 5.5 stops doing this spuriously
if (e != impl::NetworkError
// not interested in this with UDP socket
&& e != impl::ConnectionRefusedError)
if (e != impl::NetworkError // take this out when Qt 5.5 stops doing this spuriously
&& e != impl::ConnectionRefusedError) // not interested in this with UDP socket
{
#else
Q_UNUSED (e);
{
Q_UNUSED (e);
#endif
{
Q_EMIT error (m_->errorString ());
}
});
Q_EMIT error (m_->errorString ());
}
});
set_server (server);
}