From a984dec8653a88a7bfcf45331ad584364dd234ec Mon Sep 17 00:00:00 2001 From: David Fuhrmann Date: Sat, 2 Jan 2016 22:25:58 +0100 Subject: [PATCH] macosx: do not load windows if not necessary --- modules/gui/macosx/AudioEffects.m | 2 +- modules/gui/macosx/ResumeDialogController.m | 2 +- modules/gui/macosx/TrackSynchronization.m | 2 +- modules/gui/macosx/VideoEffects.m | 2 +- modules/gui/macosx/bookmarks.m | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/gui/macosx/AudioEffects.m b/modules/gui/macosx/AudioEffects.m index c0dde238a5..7faf6f2117 100644 --- a/modules/gui/macosx/AudioEffects.m +++ b/modules/gui/macosx/AudioEffects.m @@ -194,7 +194,7 @@ #pragma mark generic code - (void)updateCocoaWindowLevel:(NSInteger)i_level { - if (self.window && [self.window isVisible] && [self.window level] != i_level) + if (self.isWindowLoaded && [self.window isVisible] && [self.window level] != i_level) [self.window setLevel: i_level]; } diff --git a/modules/gui/macosx/ResumeDialogController.m b/modules/gui/macosx/ResumeDialogController.m index a89a89b631..e427213a83 100644 --- a/modules/gui/macosx/ResumeDialogController.m +++ b/modules/gui/macosx/ResumeDialogController.m @@ -122,7 +122,7 @@ - (void)updateCocoaWindowLevel:(NSInteger)i_level { - if (self.window && [self.window isVisible] && [self.window level] != i_level) + if (self.isWindowLoaded && [self.window isVisible] && [self.window level] != i_level) [self.window setLevel: i_level]; } diff --git a/modules/gui/macosx/TrackSynchronization.m b/modules/gui/macosx/TrackSynchronization.m index 3780195ab7..ec4057bb03 100644 --- a/modules/gui/macosx/TrackSynchronization.m +++ b/modules/gui/macosx/TrackSynchronization.m @@ -88,7 +88,7 @@ - (void)updateCocoaWindowLevel:(NSInteger)i_level { - if (self.window && [self.window isVisible] && [self.window level] != i_level) + if (self.isWindowLoaded && [self.window isVisible] && [self.window level] != i_level) [self.window setLevel: i_level]; } diff --git a/modules/gui/macosx/VideoEffects.m b/modules/gui/macosx/VideoEffects.m index 4d9272af9f..73378b2dff 100644 --- a/modules/gui/macosx/VideoEffects.m +++ b/modules/gui/macosx/VideoEffects.m @@ -210,7 +210,7 @@ - (void)updateCocoaWindowLevel:(NSInteger)i_level { - if (self.window && [self.window isVisible] && [self.window level] != i_level) + if (self.isWindowLoaded && [self.window isVisible] && [self.window level] != i_level) [self.window setLevel: i_level]; } diff --git a/modules/gui/macosx/bookmarks.m b/modules/gui/macosx/bookmarks.m index 6dc3c928b7..9caaf26b68 100644 --- a/modules/gui/macosx/bookmarks.m +++ b/modules/gui/macosx/bookmarks.m @@ -99,7 +99,7 @@ - (void)updateCocoaWindowLevel:(NSInteger)i_level { - if (self.window && [self.window isVisible] && [self.window level] != i_level) + if (self.isWindowLoaded && [self.window isVisible] && [self.window level] != i_level) [self.window setLevel: i_level]; }