[gthumb] preloader: ignore the request if the operation was cancelled



commit 0bda7a73bb55174e12bd9dce3931001b80a8a43b
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Wed Aug 22 15:54:27 2012 +0200

    preloader: ignore the request if the operation was cancelled

 gthumb/gth-image-preloader.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gthumb/gth-image-preloader.c b/gthumb/gth-image-preloader.c
index e63af67..08ca392 100644
--- a/gthumb/gth-image-preloader.c
+++ b/gthumb/gth-image-preloader.c
@@ -404,7 +404,8 @@ image_loader_ready_cb (GObject      *source_object,
 						 &original_height,
 						 &error);
 
-	if (! g_file_equal (load_request->file_data->file, preloader->file_data->file)
+	if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)
+	    || ! g_file_equal (load_request->file_data->file, preloader->file_data->file)
 	    || (preloader->token != self->priv->token))
 	{
 		load_request_free (load_request);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]