diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-02-07 14:29:20 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-07 20:39:31 +0000 |
| commit | b1e45c93e8e6339df6d7b7158029cbd9550c08cc (patch) | |
| tree | 7c5a6f31be83af26fe2f6be39f9fdfabb2b6a746 /vcl/osx | |
| parent | 1edca1fe0aaadbd48ea23b691dc244ad2a6b6f73 (diff) | |
Related: #i124201# fix frame-list handling with AppleRemote events
(cherry picked from commit 2d6f7c351fd53de62af5262778173538942aa4b1)
Conflicts:
vcl/osx/salinst.cxx
Change-Id: I3f80bacd673f06be92406d397260d5b7bb0d1a19
Diffstat (limited to 'vcl/osx')
| -rw-r--r-- | vcl/osx/salinst.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 58b0f0fb7a6b..723ad00b4c20 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -586,7 +586,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 ) { |