[gthumb] kill the script process as well when stopping the thumb loader
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] kill the script process as well when stopping the thumb loader
- Date: Thu, 29 Apr 2010 20:58:51 +0000 (UTC)
commit de0b5b02f02b5786da6daa5a788f9271539071ae
Author: Paolo Bacchilega <paobac src gnome org>
Date: Thu Apr 29 22:51:21 2010 +0200
kill the script process as well when stopping the thumb loader
[bug #614219]
gthumb/gth-thumb-loader.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/gthumb/gth-thumb-loader.c b/gthumb/gth-thumb-loader.c
index 7058493..e85e6d7 100644
--- a/gthumb/gth-thumb-loader.c
+++ b/gthumb/gth-thumb-loader.c
@@ -599,8 +599,10 @@ kill_thumbnailer_cb (gpointer data)
{
GthThumbLoader *self = data;
- g_source_remove (self->priv->thumbnailer_timeout);
- self->priv->thumbnailer_timeout = 0;
+ if (self->priv->thumbnailer_timeout != 0) {
+ g_source_remove (self->priv->thumbnailer_timeout);
+ self->priv->thumbnailer_timeout = 0;
+ }
if (self->priv->thumbnailer_pid != 0) {
/*g_source_remove (self->priv->thumbnailer_watch);
@@ -747,5 +749,12 @@ gth_thumb_loader_cancel (GthThumbLoader *self,
{
g_return_if_fail (self->priv->iloader != NULL);
+ if (self->priv->thumbnailer_watch != 0) {
+ /* kill the thumbnailer script */
+ g_source_remove (self->priv->thumbnailer_watch);
+ self->priv->thumbnailer_watch = 0;
+ kill_thumbnailer_cb (self);
+ }
+
gth_image_loader_cancel (self->priv->iloader, done_func, done_func_data);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]