summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/virt-viewer-events.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/virt-viewer-events.c b/src/virt-viewer-events.c
index 1655a70..f68791f 100644
--- a/src/virt-viewer-events.c
+++ b/src/virt-viewer-events.c
@@ -203,13 +203,11 @@ virt_viewer_events_cleanup_handle(gpointer user_data)
g_debug("Cleanup of handle %p", data);
g_return_val_if_fail(data != NULL, FALSE);
- g_mutex_lock(eventlock);
-
if (data->ff)
(data->ff)(data->opaque);
+ g_mutex_lock(eventlock);
g_ptr_array_remove_fast(handles, data);
-
g_mutex_unlock(eventlock);
return FALSE;
@@ -382,13 +380,11 @@ virt_viewer_events_cleanup_timeout(gpointer user_data)
g_debug("Cleanup of timeout %p", data);
g_return_val_if_fail(data != NULL, FALSE);
- g_mutex_lock(eventlock);
-
if (data->ff)
(data->ff)(data->opaque);
+ g_mutex_lock(eventlock);
g_ptr_array_remove_fast(timeouts, data);
-
g_mutex_unlock(eventlock);
return FALSE;