summaryrefslogtreecommitdiff
path: root/gtk/gtkspinner.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-11-30 15:59:49 +0100
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-11-30 15:59:49 +0100
commit8076dbfb5c9b358642b43a82bda36e649b0fe038 (patch)
treef0d9f8677fe22266ff95ca15abf5ef3f316220ff /gtk/gtkspinner.c
parent922324553be10f847d4bdc3a177e641887a2921d (diff)
downloadgtk+-8076dbfb5c9b358642b43a82bda36e649b0fe038.tar.gz
gtkspinner: don't setup the timeout twice (#636129)
Diffstat (limited to 'gtk/gtkspinner.c')
-rw-r--r--gtk/gtkspinner.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index 802689dd2a..2af87b061f 100644
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -293,6 +293,7 @@ gtk_spinner_add_timeout (GtkSpinner *spinner)
priv = spinner->priv;
+ g_assert (priv->timeout == 0);
priv->timeout = gdk_threads_add_timeout ((guint) priv->cycle_duration / priv->num_steps, gtk_spinner_timeout, spinner);
}
@@ -315,7 +316,7 @@ gtk_spinner_map (GtkWidget *widget)
GTK_WIDGET_CLASS (gtk_spinner_parent_class)->map (widget);
- if (priv->active)
+ if (priv->active && priv->timeout == 0)
gtk_spinner_add_timeout (spinner);
}