[vlc-devel] commit: Win32 cancel assert fixes ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Tue Jan 27 18:52:18 2009 +0200| [bce706f4fa75d422475866a11e5ebc8f8da879c0] | committer: Rémi Denis-Courmont 

Win32 cancel assert fixes

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bce706f4fa75d422475866a11e5ebc8f8da879c0
---

 src/misc/threads.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 56096b2..97fa5de 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -843,7 +843,7 @@ int vlc_savecancel (void)
 #else
     vlc_cancel_t *nfo = vlc_threadvar_get (&cancel_key);
     if (nfo == NULL)
-        return true; /* Main thread - cannot be cancelled anyway */
+        return false; /* Main thread - cannot be cancelled anyway */
 
      state = nfo->killable;
      nfo->killable = false;
@@ -881,7 +881,7 @@ void vlc_restorecancel (int state)
     if (nfo == NULL)
         return; /* Main thread - cannot be cancelled anyway */
 
-    assert (nfo->killable);
+    assert (!nfo->killable);
     nfo->killable = state != 0;
 
 #endif