[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/network/ktorrent
From:       Joris Guisson <joris.guisson () gmail ! com>
Date:       2010-09-24 10:48:48
Message-ID: 20100924104848.907A3AC88C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1179024 by guisson:

Merge rev 1179021 from stable (fix for 252099)


 M  +1 -0      ChangeLog  
 U             ktorrent/app.cpp  
 M  +6 -2      ktorrent/core.cpp  
 M  +1 -0      ktorrent/core.h  


--- trunk/extragear/network/ktorrent/ChangeLog #1179023:1179024
@@ -29,6 +29,7 @@
 - Don't hardcode background of bandwidth schedule to white so that system colors are \
                used (251925)
 - Improve performance of ViewModel when there are many torrents (216501)
 - Backport several improvements for IP filter auto update from trunk
+- Fix bug causing two instances of ktorrent to be started when missing files dialog \
is shown at startup (252099)  
 Changes in 4.0.3:
 - Fix bug causing wrong encoding to be used when the default save location of a \
                group is read (244873)
--- trunk/extragear/network/ktorrent/ktorrent/core.cpp #1179023:1179024
@@ -710,8 +710,6 @@
 				
 			qman->append(tc);
 			connectSignals(tc);
-			if (tc->getStats().autostart && !bt::QueueManagerInterface::enabled() && \
                !tc->overMaxRatio() && !tc->overMaxSeedTime())
-				start(tc);
 			torrentAdded(tc);
 		}
 		catch (bt::Error & err)
@@ -745,12 +743,18 @@
 		
 		gman->torrentsLoaded(qman);
 		qman->loadState(KGlobal::config());
+		QTimer::singleShot(0,this,SLOT(delayedStart()));
+	}
+	
+	void Core::delayedStart()
+	{
 		if (!kt::QueueManager::enabled())
 			qman->startAutoStartTorrents();
 		else
 			qman->orderQueue();
 	}
 
+
 	void Core::remove(bt::TorrentInterface* tc,bool data_to)
 	{
 		try
--- trunk/extragear/network/ktorrent/ktorrent/core.h #1179023:1179024
@@ -246,6 +246,7 @@
 		void checkForKDE3Torrents();
 		void closeScanListener(ScanListener* sl);
 		void delayedRemove(bt::TorrentInterface* tc);
+		void delayedStart();
 
 	private:
 		GUI* gui;


[prev in list] [next in list] [prev in thread] [next in thread]