[Libreoffice-commits] .: vcl/aqua

Thorsten Behrens thorsten at kemper.freedesktop.org
Thu Jan 5 15:42:42 PST 2012


 vcl/aqua/source/app/salinst.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2f1c17087cad93f7692c33ed5364f5ad7f16ebfb
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Fri Jan 6 00:34:10 2012 +0100

    Fix fdo#33816 - don't loop infinitely when using Apple Remote
    
    Removed erratic loop condition - we simply want to check if any
    frame has fullscreen flag set.

diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 3df6844..dbff33c 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -626,9 +626,9 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
         bool bIsFullScreenMode = false;
 
         std::list<AquaSalFrame*>::iterator it = pSalData->maFrames.begin();
-        while( (*it) &&  ( (it != pSalData->maFrames.end() ) || ( (*it)->mbFullScreen == false ) ) )
+        while( it != pSalData->maFrames.end() )
         {
-            if ( ((*it)->mbFullScreen == true) )
+            if ( (*it) && ((*it)->mbFullScreen == true) )
                 bIsFullScreenMode = true;
             ++it;
         }


More information about the Libreoffice-commits mailing list