Commit c8988a84 authored by Joris Guisson's avatar Joris Guisson
Browse files

Merged rev 783509 (KResolverResults crash, 158940)

svn path=/branches/ktorrent/3.0/; revision=783510
parent 5e1c1f18
......@@ -11,6 +11,7 @@ in stats plugin
- Remove minimum vertical size of URL requester in torrent creation dialog,
this makes sure that it is sized properly when you open the dialog
- Fix changing text codec for multifile torrents (158775)
- Fix crash in handling of KResolverResults (158940)
Changes in 3.O :
- Fix sorting of upload and download rate (157939)
......
......@@ -166,6 +166,9 @@ namespace bt
void PeerManager::onResolverResults(KResolverResults res)
{
if (res.count() == 0)
return;
net::Address addr = res.front().address().asInet();
PotentialPeer pp;
......
......@@ -282,7 +282,11 @@ namespace bt
void UDPTracker::onResolverResults(KResolverResults res)
{
address = res.front().address();
if (res.count() > 0)
address = res.front().address();
else
KResolver::resolveAsync(this,SLOT(onResolverResults(KNetwork::KResolverResults )),
url.host(),QString::number(url.port()));
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment