[vlc-devel] commit: Qt4: Disable cancellation while writing a message to the log dialog ( Rémi Denis-Courmont )
git version control
git at videolan.org
Tue Jan 6 11:07:03 CET 2009
vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Tue Jan 6 12:05:48 2009 +0200| [2cc94e2e0d0d90b6b3f21d70af64cf7a815083fb] | committer: Rémi Denis-Courmont
Qt4: Disable cancellation while writing a message to the log dialog
As pointed out by Laurent, cancellation was not safe here
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2cc94e2e0d0d90b6b3f21d70af64cf7a815083fb
---
modules/gui/qt4/dialogs/messages.cpp | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index 44c8d4a..b2e20b3 100644
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -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)
More information about the vlc-devel
mailing list