]> git.sesse.net Git - vlc/commitdiff
Qt4: Disable cancellation while writing a message to the log dialog
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Tue, 6 Jan 2009 10:05:48 +0000 (12:05 +0200)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Tue, 6 Jan 2009 10:06:59 +0000 (12:06 +0200)
As pointed out by Laurent, cancellation was not safe here

modules/gui/qt4/dialogs/messages.cpp

index 44c8d4a5a832f723c59587bf5cf787e9bea8fe13..b2e20b351ecccf6eb53aeb1335ccd375462240d5 100644 (file)
@@ -153,9 +153,11 @@ void MessagesDialog::sinkMessage (msg_cb_data_t *data, msg_item_t *item,
                                   unsigned overruns)
 {
     MessagesDialog *self = data->self;
+    int canc = vlc_savecancel ();
     QMutexLocker locker (&data->lock);
 
     self->sinkMessage (item, overruns);
+    vlc_restorecancel (canc);
 }
 
 void MessagesDialog::sinkMessage (msg_item_t *item, unsigned)