mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 19:30:21 +02:00
Code Issues Releases Wiki Activity

Only delete qnam objects in liblastfm2 that it creates itself

Browse Source
This commit is contained in:
Jeff Mitchell
2011-05-01 10:27:43 -04:00
parent e8f2eedcb9
commit 7f7c55a293
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
thirdparty/liblastfm2/src/ws/ws.cpp vendored
View File

@@ -26,9 +26,12 @@
#include <QLocale>
#include <QStringList>
#include <QThread>
#include <QMutex>
#include <QUrl>
static QMap< QThread*, QNetworkAccessManager* > threadNamMap;
static QMap< QThread*, QNetworkAccessManager* > threadNamHash;
static QMap< QThread*, bool > ourNamHash;
static QMutex namAccessMutex;
QString
lastfm::ws::host()
@@ -193,29 +196,33 @@ lastfm::ws::parse( QNetworkReply* reply ) throw( ParseError )
QNetworkAccessManager*
lastfm::nam()
{
QMutexLocker l( &namAccessMutex );
QThread* thread = QThread::currentThread();
if ( !threadNamMap.contains( thread ) )
if ( !threadNamHash.contains( thread ) )
{
NetworkAccessManager* newNam = new NetworkAccessManager();
threadNamMap[thread] = newNam;
threadNamHash[thread] = newNam;
ourNamHash[thread] = true;
return newNam;
}
return threadNamMap[thread];
return threadNamHash[thread];
}
void
lastfm::setNetworkAccessManager( QNetworkAccessManager* nam )
{
if ( !nam )
return;
QMutexLocker l( &namAccessMutex );
QThread* thread = QThread::currentThread();
if ( threadNamMap.contains( thread ) )
{
delete threadNamMap[thread];
threadNamMap[thread] = 0;
}
if ( threadNamHash.contains( thread ) && ourNamHash.contains( thread ) && ourNamHash[thread] )
delete threadNamHash[thread];
threadNamMap[thread] = nam;
threadNamHash[thread] = nam;
ourNamHash[thread] = false;
}