Commit bce706f4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Win32 cancel assert fixes

parent 825731a1
...@@ -843,7 +843,7 @@ int vlc_savecancel (void) ...@@ -843,7 +843,7 @@ int vlc_savecancel (void)
#else #else
vlc_cancel_t *nfo = vlc_threadvar_get (&cancel_key); vlc_cancel_t *nfo = vlc_threadvar_get (&cancel_key);
if (nfo == NULL) if (nfo == NULL)
return true; /* Main thread - cannot be cancelled anyway */ return false; /* Main thread - cannot be cancelled anyway */
state = nfo->killable; state = nfo->killable;
nfo->killable = false; nfo->killable = false;
...@@ -881,7 +881,7 @@ void vlc_restorecancel (int state) ...@@ -881,7 +881,7 @@ void vlc_restorecancel (int state)
if (nfo == NULL) if (nfo == NULL)
return; /* Main thread - cannot be cancelled anyway */ return; /* Main thread - cannot be cancelled anyway */
assert (nfo->killable); assert (!nfo->killable);
nfo->killable = state != 0; nfo->killable = state != 0;
#endif #endif
......
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