Commit 60a4b96a authored by Joris Guisson's avatar Joris Guisson
Browse files

Merged rev 795097 (plugin unloading Qt 4.4 crash)

svn path=/branches/ktorrent/3.0/; revision=795099
parent 71ce26a1
......@@ -6,6 +6,7 @@ Changes in 3.0.2 :
- Fix remove from group not working (160499)
- Fix crash in torrent creator when there are no trackers
- Fix sorting in files tab
- Fix crash when unloading plugins with Qt4.4 (160565)
Changes in 3.0.1 :
- Fix sessionTTL not being able to be bigger then 99
......
......@@ -116,7 +116,6 @@ namespace kt
if (m_editor)
{
getGUI()->removeTabPage(m_editor);
m_editor->deleteLater();
m_editor = 0;
}
......@@ -200,7 +199,6 @@ namespace kt
if (m_editor)
{
getGUI()->removeTabPage(m_editor);
m_editor->deleteLater();
m_editor = 0;
}
}
......@@ -212,7 +210,6 @@ namespace kt
return;
getGUI()->removeTabPage(m_editor);
m_editor->deleteLater();
m_editor = 0;
m_bws_action->setChecked(false);
}
......
......@@ -123,7 +123,6 @@ namespace kt
peer_view = 0;
delete tracker_view;
tracker_view = 0;
pref->deleteLater();
pref = 0;
}
......
......@@ -77,7 +77,6 @@ namespace kt
ipblist.unsetPluginInterfacePtr();
getGUI()->removePrefPage(pref);
pref->deleteLater();
pref = 0;
if(level1)
{
......
......@@ -69,9 +69,7 @@ namespace kt
getGUI()->removeToolWidget(lv);
getGUI()->removePrefPage(pref);
RemoveLogMonitor(lv);
lv->deleteLater();
lv = 0;
pref->deleteLater();
pref = 0;
LogFlags::finalize();
}
......
......@@ -71,7 +71,6 @@ namespace kt
void ScanFolderPlugin::unload()
{
getGUI()->removePrefPage(pref);
pref->deleteLater();
pref = 0;
m_sf_map.clear();
......
......@@ -94,7 +94,6 @@ namespace kt
searches.clear();
getGUI()->removePrefPage(pref);
pref->deleteLater();
pref = 0;
toolbar = 0;
disconnect(getCore(),SIGNAL(settingsChanged()),this,SLOT(preferencesUpdated()));
......
......@@ -83,10 +83,7 @@ void StatsPlugin::unload()
pmUiSpd.reset();
pmUiConns.reset();
pmUiSett -> deleteLater();
pmUiSett = 0;
pmDispSett -> deleteLater();
pmDispSett = 0;
pmTmr.reset();
......
......@@ -73,7 +73,6 @@ namespace kt
sock->saveRouters(routers_file);
this->getGUI()->removePrefPage(pref);
sock->close();
pref->deleteLater();
pref = 0;
delete sock;
sock = 0;
......
......@@ -71,7 +71,6 @@ namespace kt
}
getGUI()->removePrefPage(pref);
pref->deleteLater();
pref = 0;
disconnect(getCore(),SIGNAL(settingsChanged()),this,SLOT(preferencesUpdated()));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment