Win32: fix vlc_control_cancel from main() task

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 99c602aac410522b9b650ddd12e5c208aa1ee54d..c6f47f795a357e8f51a7379847f6f50cc0bdd802 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -850,16 +850,19 @@ void vlc_control_cancel (int cmd, ...)
     va_start (ap, cmd);
 
     vlc_cancel_t *nfo = vlc_threadvar_get (&cancel_key);
-#ifndef WIN32
     if (nfo == NULL)
     {
+#ifdef WIN32
+        /* Main thread - cannot be cancelled anyway */
+        return;
+#else
         nfo = malloc (sizeof (*nfo));
         if (nfo == NULL)
-            abort ();
+            return; /* Uho! Expect problems! */
         *nfo = VLC_CANCEL_INIT;
         vlc_threadvar_set (&cancel_key, nfo);
-    }
 #endif
+    }
 
     switch (cmd)
     {