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

fix some crashes

Browse Source
This commit is contained in:
Leo Franchi
2011-05-03 19:37:58 -04:00
parent ea5cefd2d4
commit 7d1067dafa
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/sip/SipHandler.cpp
View File

@@ -152,6 +152,7 @@ SipHandler::createPlugin( const QString& factoryId )
SipPlugin* sip = m_pluginFactories[ factoryId ]->createPlugin(); SipPlugin* sip = m_pluginFactories[ factoryId ]->createPlugin();
hookUpPlugin( sip ); hookUpPlugin( sip );
emit pluginAdded( sip );
return sip; return sip;
} }
@@ -165,6 +166,7 @@ SipHandler::loadPlugin( const QString& pluginId )
SipPlugin* sip = m_pluginFactories[ factoryName ]->createPlugin( pluginId ); SipPlugin* sip = m_pluginFactories[ factoryName ]->createPlugin( pluginId );
hookUpPlugin( sip ); hookUpPlugin( sip );
// caller responsible for calling pluginAdded()
return sip; return sip;
} }
@@ -194,8 +196,6 @@ SipHandler::hookUpPlugin( SipPlugin* sip )
QObject::connect( sip, SIGNAL( avatarReceived( QString, QPixmap ) ), SLOT( onAvatarReceived( QString, QPixmap ) ) ); QObject::connect( sip, SIGNAL( avatarReceived( QString, QPixmap ) ), SLOT( onAvatarReceived( QString, QPixmap ) ) );
QObject::connect( sip, SIGNAL( avatarReceived( QPixmap ) ), SLOT( onAvatarReceived( QPixmap ) ) ); QObject::connect( sip, SIGNAL( avatarReceived( QPixmap ) ), SLOT( onAvatarReceived( QPixmap ) ) );
emit pluginAdded( sip );
} }

4
src/settingsdialog.cpp
View File

@@ -537,7 +537,7 @@ SettingsDialog::sipFactoryClicked( SipPluginFactory* factory )
added = true; added = true;
} else { } else {
// canceled, delete it // canceled, delete it
delete p; added = false;
} }
} else { } else {
// no config, so just add it // no config, so just add it
@@ -560,6 +560,8 @@ SettingsDialog::sipFactoryClicked( SipPluginFactory* factory )
} }
if( toremove ) if( toremove )
ui->addSipButton->removeAction( toremove ); ui->addSipButton->removeAction( toremove );
} else if( added == false ) { // user pressed cancel
delete p;
} }
} }