Skip to content

V
vlc-1.1
Commit 2cc94e2e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Qt4: Disable cancellation while writing a message to the log dialog 

As pointed out by Laurent, cancellation was not safe here
parent 6f323e7a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
modules/gui/qt4/dialogs/messages.cpp
View file @ 2cc94e2e
...@@ -153,9 +153,11 @@ void MessagesDialog::sinkMessage (msg_cb_data_t *data, msg_item_t *item, ...@@ -153,9 +153,11 @@ void MessagesDialog::sinkMessage (msg_cb_data_t *data, msg_item_t *item,
unsigned overruns) unsigned overruns)
{ {
MessagesDialog *self = data->self; MessagesDialog *self = data->self;
int canc = vlc_savecancel ();
QMutexLocker locker (&data->lock); QMutexLocker locker (&data->lock);
self->sinkMessage (item, overruns); self->sinkMessage (item, overruns);
vlc_restorecancel (canc);
} }
void MessagesDialog::sinkMessage (msg_item_t *item, unsigned) void MessagesDialog::sinkMessage (msg_item_t *item, unsigned)
......
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