mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-10-30 20:40:28 -04:00 
			
		
		
		
	Skipping of connection refused net errors on Windows with Qt 5.15
Apparently this is still required.
This commit is contained in:
		
							parent
							
								
									a02535d655
								
							
						
					
					
						commit
						a24f402655
					
				| @ -425,28 +425,23 @@ MessageClient::MessageClient (QString const& id, QString const& version, QString | |||||||
| { | { | ||||||
| #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) | #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) | ||||||
|   connect (&*m_, static_cast<void (impl::*) (impl::SocketError)> (&impl::error) |   connect (&*m_, static_cast<void (impl::*) (impl::SocketError)> (&impl::error) | ||||||
|            , [this] (impl::SocketError e) |            , [this] (impl::SocketError e) { | ||||||
|            { |  | ||||||
| #if defined (Q_OS_WIN) |  | ||||||
|              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 | #else | ||||||
|              Q_UNUSED (e); |   connect (&*m_, &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) | ||||||
|  | #else | ||||||
|  |                Q_UNUSED (e); | ||||||
| #endif | #endif | ||||||
|                { |                { | ||||||
|                  Q_EMIT error (m_->errorString ()); |                  Q_EMIT error (m_->errorString ()); | ||||||
|                } |                } | ||||||
|            }); |            }); | ||||||
| #else | 
 | ||||||
|   connect (&*m_, &impl::errorOccurred, [this] (impl::SocketError) { |  | ||||||
|                                          Q_EMIT error (m_->errorString ()); |  | ||||||
|                                        }); |  | ||||||
| #endif |  | ||||||
|   set_server (server); |   set_server (server); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user