Commit c85ff0c7 authored by Benjamin Otte's avatar Benjamin Otte

[gio] minor improvements to g_cancellable_cancel()

- make this function not crash when cancellable is NULL
- avoid locking when the cancellable has already been cancelled
parent 8a2e617e
......@@ -514,27 +514,27 @@ g_cancellable_make_pollfd (GCancellable *cancellable, GPollFD *pollfd)
void
g_cancellable_cancel (GCancellable *cancellable)
{
static const char ch = 'x';
gboolean cancel;
GCancellablePrivate *priv;
if (cancellable == NULL ||
priv->cancelled)
return;
priv = cancellable->priv;
cancel = FALSE;
G_LOCK(cancellable);
if (cancellable != NULL &&
!priv->cancelled)
{
char ch = 'x';
cancel = TRUE;
priv->cancelled = TRUE;
priv->cancelled_running = TRUE;
cancel = TRUE;
priv->cancelled = TRUE;
priv->cancelled_running = TRUE;
#ifdef G_OS_WIN32
if (priv->event)
SetEvent(priv->event);
if (priv->event)
SetEvent(priv->event);
#endif
if (priv->cancel_pipe[1] != -1)
write (priv->cancel_pipe[1], &ch, 1);
}
if (priv->cancel_pipe[1] != -1)
write (priv->cancel_pipe[1], &ch, 1);
G_UNLOCK(cancellable);
if (cancel)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment