[vlc-commits] remoteosd: small simplification

Rémi Denis-Courmont git at videolan.org
Thu Jul 9 20:34:19 CEST 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul  9 21:25:27 2015 +0300| [b3282523a2d31fb141dbc15e64e9ec0788a6505f] | committer: Rémi Denis-Courmont

remoteosd: small simplification

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

 modules/video_filter/remoteosd.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/video_filter/remoteosd.c b/modules/video_filter/remoteosd.c
index 8d6eae4..9215359 100644
--- a/modules/video_filter/remoteosd.c
+++ b/modules/video_filter/remoteosd.c
@@ -615,13 +615,13 @@ static void* vnc_worker_thread( void *obj )
     }
 
     /* connection is initialized, now read and handle server messages */
-    vlc_restorecancel (canc);
     for( ;; )
     {
         rfbServerToClientMsg msg;
         int i_msgSize;
 
         memset( &msg, 0, sizeof(msg) );
+        vlc_restorecancel (canc);
 
         if( !read_exact(p_filter, fd, &msg, 1 ) )
         {
@@ -666,9 +666,7 @@ static void* vnc_worker_thread( void *obj )
 
         canc = vlc_savecancel ();
         process_server_message( p_filter, &msg);
-        vlc_restorecancel (canc);
     }
-    canc = vlc_savecancel ();
 
     if( polling )
     {



More information about the vlc-commits mailing list