diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-02-07 14:29:20 +0000 |
|---|---|---|
| committer | Herbert Dürr <hdu@apache.org> | 2014-02-07 14:29:20 +0000 |
| commit | 2d6f7c351fd53de62af5262778173538942aa4b1 (patch) | |
| tree | 057763621c1dd7e9061f229dc40f362d15283593 | |
| parent | f60d1e36194e2fe6d479b6f747e158efd4ba9e2b (diff) | |
#i124201# fix frame-list handling with AppleRemote events
iterating beyond the end of a frame-list must be avoided
Notes
Notes:
merged as: b1e45c93e8e6339df6d7b7158029cbd9550c08cc
| -rw-r--r-- | vcl/aqua/source/app/salinst.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 26cccd4ca534..42afa6ecbf9e 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -622,11 +622,10 @@ 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 ) ) ) + for(; it != pSalData->maFrames.end(); ++it ) { if( (*it)->mbFullScreen ) bIsFullScreenMode = true; - it++; } switch ([pEvent data1]) @@ -663,7 +662,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) break; } AquaSalFrame* pFrame = pSalData->maFrames.front(); - Window * pWindow = pFrame->GetWindow() ? pSalData->maFrames.front()->GetWindow() : NULL; + Window* pWindow = pFrame ? pFrame->GetWindow() : NULL; if( pWindow ) { |