[gthumb] stop thumbnail creation if the gth_file_list_cancel was called
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] stop thumbnail creation if the gth_file_list_cancel was called
- Date: Mon, 13 Sep 2010 15:55:34 +0000 (UTC)
commit 8defdc67c528081587a272e2c4b5610204018b6a
Author: Paolo Bacchilega <paobac src gnome org>
Date: Mon Sep 13 17:55:03 2010 +0200
stop thumbnail creation if the gth_file_list_cancel was called
gthumb/gth-file-list.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gthumb/gth-file-list.c b/gthumb/gth-file-list.c
index ea9ccbf..414ef89 100644
--- a/gthumb/gth-file-list.c
+++ b/gthumb/gth-file-list.c
@@ -123,6 +123,7 @@ struct _GthFileListPrivateData
GtkCellRenderer *text_renderer;
GtkCellRenderer *checkbox_renderer;
char **caption_attributes_v;
+ gboolean cancelled;
};
@@ -227,7 +228,7 @@ _gth_file_list_queue_op (GthFileList *file_list,
if (op->type == GTH_FILE_LIST_OP_TYPE_SET_FILTER)
_gth_file_list_remove_op (file_list, GTH_FILE_LIST_OP_TYPE_SET_FILTER);
file_list->priv->queue = g_list_append (file_list->priv->queue, op);
-
+ file_list->priv->cancelled = FALSE;
if (! file_list->priv->loading_thumbs)
_gth_file_list_exec_next_op (file_list);
}
@@ -354,6 +355,7 @@ gth_file_list_init (GthFileList *file_list)
file_list->priv->ignore_hidden_thumbs = FALSE;
file_list->priv->load_thumbs = TRUE;
file_list->priv->caption_attributes_v = g_strsplit ("none", ",", -1);
+ file_list->priv->cancelled = FALSE;
}
@@ -814,6 +816,7 @@ gth_file_list_cancel (GthFileList *file_list,
DataFunc done_func,
gpointer user_data)
{
+ file_list->priv->cancelled = TRUE;
_gth_file_list_clear_queue (file_list);
_gth_file_list_cancel_jobs (file_list, done_func, user_data);
}
@@ -1795,7 +1798,7 @@ _gth_file_list_exec_next_op (GthFileList *file_list)
GthFileListOp *op;
gboolean exec_next_op = TRUE;
- if (file_list->priv->queue == NULL) {
+ if ((file_list->priv->queue == NULL) && ! file_list->priv->cancelled) {
start_update_next_thumb (file_list);
return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]