[gthumb] image preloader: cancel the current loader before starting the new one

[Paolo Bacchilega <paobac src gnome org>]

commit 05b34d47ba0bdbb7ccd0a5ee4458bf39bc2c004e
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu Apr 28 15:14:02 2011 +0200

    image preloader: cancel the current loader before starting the new one

 gthumb/gth-image-preloader.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/gthumb/gth-image-preloader.c b/gthumb/gth-image-preloader.c
index fbd8cf1..9d62667 100644
--- a/gthumb/gth-image-preloader.c
+++ b/gthumb/gth-image-preloader.c
@@ -404,6 +404,8 @@ image_loader_ready_cb (GObject      *source_object,
 	gboolean            success;
 	int                 interval;
 
+	self->priv->current = -1;
+
 	success = gth_image_loader_load_finish  (GTH_IMAGE_LOADER (source_object),
 						 result,
 						 &image,
@@ -760,6 +762,14 @@ gth_image_preloader_load (GthImagePreloader *self,
 	va_end (args);
 	load_data->n_files = n;
 
+	if (self->priv->current != -1) {
+		Preloader *preloader;
+
+		preloader = current_preloader (self);
+		if (preloader != NULL)
+			g_cancellable_cancel (preloader->self->priv->cancellable);
+	}
+
 	assign_loaders (load_data);
 	start_next_loader (self);