From 8b1a9d1f18175ec7787764d50869840995d4ab3a Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Sun, 13 Feb 2011 22:41:51 -0500 Subject: [PATCH] When using UPnP mode and it doens't work and you have an external address/port set, fall back to using those. --- src/libtomahawk/network/servent.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/network/servent.cpp b/src/libtomahawk/network/servent.cpp index b2444b47e..4d69e8134 100644 --- a/src/libtomahawk/network/servent.cpp +++ b/src/libtomahawk/network/servent.cpp @@ -146,9 +146,18 @@ Servent::setExternalAddress( QHostAddress ha, unsigned int port ) m_externalAddress = ha; m_externalPort = port; - if( m_externalPort == 0 ) + if( m_externalPort == 0 || m_externalAddress.toString().isEmpty() ) { - qDebug() << "No external access, LAN and outbound connections only!"; + if( !TomahawkSettings::instance()->externalHostname().isEmpty() && + !TomahawkSettings::instance()->externalPort() == 0 ) + { + qDebug() << "UPnP failed, have external address/port -- falling back"; + m_externalHostname = TomahawkSettings::instance()->externalHostname(); + m_externalPort = TomahawkSettings::instance()->externalPort(); + qDebug() << m_externalHostname << m_externalPort; + } + else + qDebug() << "No external access, LAN and outbound connections only!"; } emit ready();