summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabiano FidĂȘncio <fidencio@redhat.com>2015-07-22 03:27:50 +0200
committerFabiano FidĂȘncio <fidencio@redhat.com>2015-07-22 14:56:57 +0200
commit7805b67b68aba43afb7f421f76cf0c49afa3ea06 (patch)
treea9998b64be79d783af078615ff6413acbfc0ffc7
parenta7050b7d2c82c103bc932a327a7a9152ab77a033 (diff)
downloadvirt-viewer-7805b67b68aba43afb7f421f76cf0c49afa3ea06.tar.gz
virt-viewer-7805b67b68aba43afb7f421f76cf0c49afa3ea06.tar.xz
virt-viewer-7805b67b68aba43afb7f421f76cf0c49afa3ea06.zip
events: allow zero timeouts for timer
In libvirt, it's perfectly possible and widely used to have disabled timers (timeout=-1) and fire them up 'randomly' with timeout=0. However, with current mapping into glib mainloop it's not possible and causing troubles. Based on commit a40a1732e0d53fcc44b8d348cec97152dafd2b88 from libvirt-glib. Original author: Michal Privoznik <mprivozn@redhat.com> Related to: rhbz#1243228
-rw-r--r--src/virt-viewer-events.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/virt-viewer-events.c b/src/virt-viewer-events.c
index 02b7216..462ce6c 100644
--- a/src/virt-viewer-events.c
+++ b/src/virt-viewer-events.c
@@ -349,7 +349,7 @@ virt_viewer_events_update_timeout(int timer,
if (interval >= 0) {
if (data->source)
- goto cleanup;
+ g_source_remove(data->source);
data->interval = interval;
data->source = g_timeout_add(data->interval,