mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-21 13:21:52 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	src/libtomahawk/sip/SipPlugin.cpp
	src/resolverconfigdelegate.cpp
	src/sip/jreen/jabber.cpp
	src/sip/jreen/jabber.h
This commit is contained in:
Leo Franchi
2011-05-03 16:16:16 -04:00
parent e1aee9b299 7a595aaa76
commit ea7e8f6ede
39 changed files with 752 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,11 +218,15 @@ lastfm::setNetworkAccessManager( QNetworkAccessManager* nam )
QMutexLocker l( &namAccessMutex );
QThread* thread = QThread::currentThread();
QNetworkAccessManager* oldNam = 0;
if ( threadNamHash.contains( thread ) && ourNamHash.contains( thread ) && ourNamHash[thread] )
delete threadNamHash[thread];
oldNam = threadNamHash[thread];
threadNamHash[thread] = nam;
ourNamHash[thread] = false;
if ( oldNam )
delete oldNam;
}