diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-10-20 19:37:01 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-10-25 13:41:57 +0100 |
| commit | 1e6151c19e09a1e99018dc387427bf7ee13f1695 (patch) | |
| tree | 80b0db13fbd7135a88fde4acbae841b0d3c6d720 | |
| parent | 1bfd9b5465f1a2930210a54c285936c3ecb4bff5 (diff) | |
generic: fix error trap push/pop/reset semantics
| -rw-r--r-- | vcl/unx/generic/app/saldata.cxx | 1 | ||||
| -rw-r--r-- | vcl/unx/generic/app/wmadaptor.cxx | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index 0459ee4139a7..1164a4e9fe67 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 ed97ddb189f0..d530932a88bb 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; |