diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-04-17 06:50:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-04-17 06:50:12 +0000 |
| commit | 22c5cffa8e209080d2abab98a88f48f4eb76a160 (patch) | |
| tree | 0bf0bc36dcbd9156ed8094e2141e2900882213cc /vcl | |
| parent | 6318e24a570cce44392454cf68d9623ca4f4061c (diff) | |
INTEGRATION: CWS jl94 (1.36.64); FILE MERGED
2008/04/02 15:21:09 pl 1.36.64.1: #i87748# fix deadlock
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/app/gtkdata.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 729cce73589a..cce4a456ca46 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: gtkdata.cxx,v $ - * $Revision: 1.38 $ + * $Revision: 1.39 $ * * This file is part of OpenOffice.org. * @@ -752,7 +752,8 @@ void GtkXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) if( bWait && ! wasEvent ) g_main_context_iteration( NULL, TRUE ); } - else { + else if( userEventFn( this ) ) + { /* #i41693# in case the dispatch thread hangs in join * for this thread the condition will never be set * workaround: timeout of 1 second a emergency exit |