Commit e84c499f authored by Joris Guisson's avatar Joris Guisson
Browse files

Backport sleep supression fix from trunk

svn path=/branches/stable/extragear-kde4/network/ktorrent/; revision=983204
parent 57069af0
Changes in 3.2.3:
- Make sure View gets focus back when you are finished editing the name of a torrent
- Fix bug causing sizes > 4GB not being displayed properly plasma applet
- Fix bug causing sizes > 4GB not being displayed properly in plasma applet
- Fix bug in sleep suppression feature causing it to not work when torrents get started at startup (195991)
Changes in 3.2.2 :
- Fix crash when changing speed limits using system tray menu (188447)
......
......@@ -101,7 +101,6 @@ namespace kt
data_dir += bt::DirSeparator();
connect(&update_timer,SIGNAL(timeout()),this,SLOT(update()));
update_timer.start(CORE_UPDATE_INTERVAL);
Uint16 port = Settings::port();
if (port == 0)
......@@ -761,14 +760,11 @@ namespace kt
{
try
{
update_timer.stop();
// do nothing if new and old dir are the same
if (KUrl(data_dir) == KUrl(new_dir) || data_dir == (new_dir + bt::DirSeparator()))
{
update_timer.start(CORE_UPDATE_INTERVAL);
return true;
}
update_timer.stop();
// safety check
if (!bt::Exists(new_dir))
bt::MakeDir(new_dir);
......
......@@ -128,6 +128,7 @@ namespace kt
notifyViewListeners(view_man->getCurrentTorrent());
//markk.update();
updateActions();
core->startUpdateTimer();
}
GUI:: ~GUI()
......
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