summaryrefslogtreecommitdiff
blob: 155337f059edfb04e9966fb023e1824da35f26ae (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
diff -Naru ktorrent_old/apps/ktorrent/ktorrentcore.cpp ktorrent_new/apps/ktorrent/ktorrentcore.cpp
--- ktorrent_old/apps/ktorrent/ktorrentcore.cpp	2007-07-23 12:43:11.000000000 -0400
+++ ktorrent_new/apps/ktorrent/ktorrentcore.cpp	2007-08-07 00:44:13.000000000 -0400
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005 by                                                 *
+ *   copyright (C) 2005 by                                                 *
  *   Joris Guisson <joris.guisson@gmail.com>                               *
  *   Ivan Vasic <ivasic@gmail.com>                                         *
  *                                                                         *
@@ -593,9 +593,7 @@
 	qman->onExit(job);
 	// wait for completion of stopped events
 	if (job->needToWait())
-	{
 		WaitJob::execute(job);
-	}
 	else
 		delete job;
 	
diff -Naru ktorrent_old/libktorrent/pluginmanager.cpp ktorrent_new/libktorrent/pluginmanager.cpp
--- ktorrent_old/libktorrent/pluginmanager.cpp	2007-07-23 12:43:10.000000000 -0400
+++ ktorrent_new/libktorrent/pluginmanager.cpp	2007-08-07 00:46:55.000000000 -0400
@@ -125,12 +125,13 @@
 			p->shutdown(wjob);
 			if (wjob->needToWait())
 				bt::WaitJob::execute(wjob);
+			else
+			  delete wjob;
 		}
 		catch (Error & err)
 		{
 			Out(SYS_GEN|LOG_NOTICE) << "Error when unloading plugin: " << err.toString() << endl;
 		}
-		delete wjob;
 
 		gui->removePluginGui(p);
 		p->unload();
@@ -174,14 +175,16 @@
 				p->shutdown(wjob);
 				i++;
 			}
+
 			if (wjob->needToWait())
 				bt::WaitJob::execute(wjob);
+			else
+			  delete wjob;
 		}
 		catch (Error & err)
 		{
 			Out(SYS_GEN|LOG_NOTICE) << "Error when unloading all plugins: " << err.toString() << endl;
 		}
-		delete wjob;
 		
 		// then unload them
 		bt::PtrMap<QString,Plugin>::iterator i = plugins.begin();