Skip to content

C
core
Kaydet (Commit) 1e6151c1 authored tarafından Michael Meeks's avatar Michael Meeks
Dosyalara gözat
Seçenekler

generic: fix error trap push/pop/reset semantics

üst 1bfd9b54
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
vcl/unx/generic/app/saldata.cxx
Dosyayı görüntüle @ 1e6151c1
...@@ -294,6 +294,7 @@ bool X11SalData::ErrorTrapPop( bool bIgnoreError ) ...@@ -294,6 +294,7 @@ bool X11SalData::ErrorTrapPop( bool bIgnoreError )
bool err = false; bool err = false;
if( !bIgnoreError ) if( !bIgnoreError )
err = HasXErrorOccurred(); err = HasXErrorOccurred();
ResetXErrorOccurred();
PopXErrorLevel(); PopXErrorLevel();
return err; return err;
} }
......
vcl/unx/generic/app/wmadaptor.cxx
Dosyayı görüntüle @ 1e6151c1
...@@ -800,7 +800,7 @@ bool WMAdaptor::getNetWmName() ...@@ -800,7 +800,7 @@ bool WMAdaptor::getNetWmName()
&& nFormat == 32 && nFormat == 32
&& nItems != 0 ) && nItems != 0 )
{ {
if ( GetGenericData()->ErrorTrapPop( false ) ) if ( ! GetGenericData()->ErrorTrapPop( false ) )
{ {
GetGenericData()->ErrorTrapPush(); GetGenericData()->ErrorTrapPush();
aCheckWindow = *(XLIB_Window*)pProperty; aCheckWindow = *(XLIB_Window*)pProperty;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment