mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Don't let the InfoSystem take over ownership of info plugins

Browse Source
This commit is contained in:
Dominik Schmidt
2015-01-10 02:28:42 +01:00
parent f7f4901bbe
commit dfbd7660d0
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/accounts/xmpp/sip/XmppSip.cpp
View File

@@ -357,7 +357,10 @@ XmppSipPlugin::onDisconnect( Jreen::Client::DisconnectReason reason )
removeMenuHelper(); removeMenuHelper();
if ( !m_infoPlugin.isNull() ) if ( !m_infoPlugin.isNull() )
{
Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin() ); Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin() );
delete m_infoPlugin;
}
} }

3
src/libtomahawk/accounts/lastfm/LastFmAccount.cpp
View File

@@ -80,7 +80,10 @@ LastFmAccount::LastFmAccount( const QString& accountId )
LastFmAccount::~LastFmAccount() LastFmAccount::~LastFmAccount()
{ {
if ( m_infoPlugin ) if ( m_infoPlugin )
{
Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin() ); Tomahawk::InfoSystem::InfoSystem::instance()->removeInfoPlugin( infoPlugin() );
delete m_infoPlugin;
}
delete m_resolver.data(); delete m_resolver.data();
} }

1
src/libtomahawk/infosystem/InfoSystem.h
View File

@@ -203,7 +203,6 @@ public:
QPointer< QThread > workerThread() const; QPointer< QThread > workerThread() const;
public slots: public slots:
// InfoSystem takes ownership of InfoPlugins
void addInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin ); void addInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin );
void removeInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin ); void removeInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin );

1
src/libtomahawk/infosystem/InfoSystemWorker.cpp
View File

@@ -184,7 +184,6 @@ InfoSystemWorker::removeInfoPlugin( Tomahawk::InfoSystem::InfoPluginPtr plugin )
m_plugins.removeOne( plugin ); m_plugins.removeOne( plugin );
deregisterInfoTypes( plugin, plugin.data()->supportedGetTypes(), plugin.data()->supportedPushTypes() ); deregisterInfoTypes( plugin, plugin.data()->supportedGetTypes(), plugin.data()->supportedPushTypes() );
delete plugin.data();
} }