[vlc-commits] ncurses: no need to turn off cancellation in message callback

Rémi Denis-Courmont git at videolan.org
Thu Aug 18 22:44:40 CEST 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Aug 18 23:38:08 2011 +0300| [debf34b4232a9c388a366237fbe46fb03a01100d] | committer: Rémi Denis-Courmont

ncurses: no need to turn off cancellation in message callback

There is no potentially cancellation-unsafe code here (unlike Qt4),
since msg_Free() is safe and vlc_mutex_*() of course too.

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

 modules/gui/ncurses.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index ab160e6..a02a42d 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -1818,7 +1818,6 @@ static void HandleKey(intf_thread_t *p_intf)
 static void MsgCallback(msg_cb_data_t *data, const msg_item_t *msg)
 {
     intf_sys_t *p_sys = data->p_sys;
-    int canc = vlc_savecancel();
 
     vlc_mutex_lock(&p_sys->msg_lock);
 
@@ -1830,8 +1829,6 @@ static void MsgCallback(msg_cb_data_t *data, const msg_item_t *msg)
         p_sys->i_msgs = 0;
 
     vlc_mutex_unlock(&p_sys->msg_lock);
-
-    vlc_restorecancel(canc);
 }
 
 static inline void UpdateInput(intf_sys_t *p_sys, playlist_t *p_playlist)



More information about the vlc-commits mailing list