[vlc-commits] macosx: fix handling of video-on-top (close #9615)

[David Fuhrmann]

vlc/vlc-2.1 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Fri Oct 25 18:19:43 2013 +0200| [17a522e40e9452cf5059f4ef45185bc2d68c94e8] | committer: David Fuhrmann

macosx: fix handling of video-on-top (close #9615)
(cherry picked from commit 77cb25d1ad159d6ec924aef48e47227121b36efa)

Signed-off-by: David Fuhrmann <david.fuhrmann at googlemail.com>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=17a522e40e9452cf5059f4ef45185bc2d68c94e8
---

 modules/gui/macosx/VLCVoutWindowController.m |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/VLCVoutWindowController.m b/modules/gui/macosx/VLCVoutWindowController.m
index 0ddc338..cd613f5 100644
--- a/modules/gui/macosx/VLCVoutWindowController.m
+++ b/modules/gui/macosx/VLCVoutWindowController.m
@@ -251,8 +251,10 @@
 
     [o_vout_dict removeObjectForKey:o_key];
 
-    if ([o_vout_dict count] == 0)
+    if ([o_vout_dict count] == 0) {
         [[VLCMain sharedInstance] setActiveVideoPlayback:NO];
+        i_statusLevelWindowCounter = 0;
+    }
 }
 
 
@@ -274,7 +276,9 @@
         i_statusLevelWindowCounter++;
         [self updateWindowLevelForHelperWindows:i_level];
     } else {
-        i_statusLevelWindowCounter--;
+        if (i_statusLevelWindowCounter > 0)
+            i_statusLevelWindowCounter--;
+
         if (i_statusLevelWindowCounter == 0) {
             [self updateWindowLevelForHelperWindows:i_level];
         }