Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-03 02:50:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19 from sehraf/pr-fix_crash_on_shutdown

Browse Source 
Thx sehraf. Indeed, the object was created twice, before your patch. Not good.
This commit is contained in:
Cyril Soler 2015-08-09 17:04:24 -04:00
commit 13e77fb7e5
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -391,17 +391,17 @@ void MainWindow::initStackedPage()
std::cerr << "Looking for interfaces in existing plugins:" << std::endl; std::cerr << "Looking for interfaces in existing plugins:" << std::endl;
for(int i = 0;i<rsPlugins->nbPlugins();++i) for(int i = 0;i<rsPlugins->nbPlugins();++i)
{ {
QIcon icon ; MainPage *pluginPage = NULL;
QIcon icon, *pIcon = NULL;
if(rsPlugins->plugin(i) != NULL && rsPlugins->plugin(i)->qt_page() != NULL) if(rsPlugins->plugin(i) != NULL && (pluginPage = rsPlugins->plugin(i)->qt_page()) != NULL)
{ {
if(rsPlugins->plugin(i)->qt_icon() != NULL) if((pIcon = rsPlugins->plugin(i)->qt_icon()) != NULL)
icon = *rsPlugins->plugin(i)->qt_icon() ; icon = *pIcon ;
else else
icon = QIcon(":images/extension_48.png") ; icon = QIcon(":images/extension_48.png") ;
std::cerr << " Addign widget page for plugin " << rsPlugins->plugin(i)->getPluginName() << std::endl; std::cerr << " Addign widget page for plugin " << rsPlugins->plugin(i)->getPluginName() << std::endl;
MainPage *pluginPage = rsPlugins->plugin(i)->qt_page();
pluginPage->setIconPixmap(icon); pluginPage->setIconPixmap(icon);
pluginPage->setPageName(QString::fromUtf8(rsPlugins->plugin(i)->getPluginName().c_str())); pluginPage->setPageName(QString::fromUtf8(rsPlugins->plugin(i)->getPluginName().c_str()));
addPage(pluginPage, grp, &notify); addPage(pluginPage, grp, &notify);

10
retroshare-gui/src/gui/settings/PluginsPage.cpp
View File

@ -90,8 +90,9 @@ PluginsPage::PluginsPage(QWidget * parent, Qt::WindowFlags flags)
if(plugin!=NULL) if(plugin!=NULL)
{ {
if(plugin->qt_icon() != NULL) QIcon *icon = plugin->qt_icon();
plugin_icon = *plugin->qt_icon() ; if(icon != NULL)
plugin_icon = *icon ;
pluginTitle = QString::fromUtf8(plugin->getPluginName().c_str()) ; pluginTitle = QString::fromUtf8(plugin->getPluginName().c_str()) ;
pluginDescription = QString::fromUtf8(plugin->getShortPluginDescription().c_str()) ; pluginDescription = QString::fromUtf8(plugin->getShortPluginDescription().c_str()) ;
@ -169,8 +170,9 @@ void PluginsPage::aboutPlugin(int i)
{ {
std::cerr << "Launching about window for plugin " << i << std::endl; std::cerr << "Launching about window for plugin " << i << std::endl;
if(rsPlugins->plugin(i) != NULL && rsPlugins->plugin(i)->qt_about_page() != NULL) QDialog *dialog = NULL;
rsPlugins->plugin(i)->qt_about_page()->exec() ; if(rsPlugins->plugin(i) != NULL && (dialog = rsPlugins->plugin(i)->qt_about_page()) != NULL)
dialog->exec() ;
} }
void PluginsPage::configurePlugin(int i) void PluginsPage::configurePlugin(int i)
{ {