[f-spot] Don't crash on exit due to thread abortion.

[Ruben Vermeersch <rubenv src gnome org>]

commit 993721a795dcd7d37beb136fb54eb5bb9aa59a6c
Author: Ruben Vermeersch <ruben savanne be>
Date:   Wed Jun 16 14:56:21 2010 +0200

    Don't crash on exit due to thread abortion.

 src/ImageLoaderThread.cs |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/src/ImageLoaderThread.cs b/src/ImageLoaderThread.cs
index b7514ba..29d61a6 100644
--- a/src/ImageLoaderThread.cs
+++ b/src/ImageLoaderThread.cs
@@ -87,6 +87,8 @@ public class ImageLoaderThread {
 	   already or not.  */
 	private bool pending_notify_notified;
 
+	volatile bool should_cancel = false;
+
 	// Public API.
 
 	public delegate void PixbufLoadedHandler (ImageLoaderThread loader, RequestItem result);
@@ -109,6 +111,7 @@ public class ImageLoaderThread {
         if (worker_thread != null)
             return;
 
+		should_cancel = false;
 		worker_thread = new Thread (new ThreadStart (WorkerThread));
 		worker_thread.Start ();
     }
@@ -130,11 +133,11 @@ public class ImageLoaderThread {
 
 	public void Cleanup ()
 	{
-        var thread = worker_thread;
-        worker_thread = null;
-        
-        if (thread != null)
-            thread.Abort ();
+		should_cancel = true;
+		if (worker_thread != null) {
+			worker_thread.Join ();
+		}
+		worker_thread = null;
 	}
 
     public static void CleanAll ()
@@ -232,7 +235,7 @@ public class ImageLoaderThread {
 	{
         Log.Debug (this.ToString (), "Worker starting");
 		try {
-			while (true) {
+			while (!should_cancel) {
 				lock (processed_requests) {
 					if (current_request != null) {
 						processed_requests.Enqueue (current_request);