Fixed vout display key event thread destruction.

block_FifoWake does not work as I thought.

diff --git a/src/video_output/display.c b/src/video_output/display.c
index bbc6010afc650fec1d2d746f99c3163d19e09f26..1c1d3f452a382aee73be88aacaf9bd63e445c597 100644 (file)
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -551,13 +551,15 @@ static void *VoutDisplayEventKeyDispatch(void *data)
 
     for (;;) {
         block_t *event = block_FifoGet(osys->event.fifo);
-        if (!event)
-            return NULL;
+
+        int cancel = vlc_savecancel();
 
         int key;
         memcpy(&key, event->p_buffer, sizeof(key));
         vout_SendEventKey(osys->vout, key);
         block_Release(event);
+
+        vlc_restorecancel(cancel);
     }
 }
 
@@ -1278,8 +1280,7 @@ void vout_DeleteDisplay(vout_display_t *vd, vout_display_state_t *state)
         SplitterClose(vd);
     vout_display_Delete(vd);
     if (osys->event.fifo) {
-        block_FifoWake(osys->event.fifo);
-        vlc_join(osys->event.thread, NULL);
+        vlc_cancel(osys->event.thread);
         block_FifoRelease(osys->event.fifo);
     }
     vlc_mutex_destroy(&osys->lock);