vcl/unx/generic/app/saldata.cxx | 1 + vcl/unx/generic/app/wmadaptor.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit 30c55ed21d66fc68977881423fc3b52fdd82693b Author: Michael Meeks <michael.me...@suse.com> Date: Thu Oct 20 19:37:01 2011 +0100 generic: fix error trap push/pop/reset semantics diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index 0459ee4..1164a4e 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -294,6 +294,7 @@ bool X11SalData::ErrorTrapPop( bool bIgnoreError ) bool err = false; if( !bIgnoreError ) err = HasXErrorOccurred(); + ResetXErrorOccurred(); PopXErrorLevel(); return err; } diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx index ed97ddb..d530932 100644 --- a/vcl/unx/generic/app/wmadaptor.cxx +++ b/vcl/unx/generic/app/wmadaptor.cxx @@ -800,7 +800,7 @@ bool WMAdaptor::getNetWmName() && nFormat == 32 && nItems != 0 ) { - if ( GetGenericData()->ErrorTrapPop( false ) ) + if ( ! GetGenericData()->ErrorTrapPop( false ) ) { GetGenericData()->ErrorTrapPush(); aCheckWindow = *(XLIB_Window*)pProperty; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits