]> git.sesse.net Git - vlc/commitdiff
macosx: fix show fs controller hotkey (default i)
authorDavid Fuhrmann <dfuhrmann@videolan.org>
Fri, 9 May 2014 14:33:57 +0000 (16:33 +0200)
committerDavid Fuhrmann <dfuhrmann@videolan.org>
Sat, 10 May 2014 11:51:13 +0000 (13:51 +0200)
modules/gui/macosx/intf.m

index 005390a01bca62ccad094c5d88c9ac79cba73bd3..79cad6c55e8cff28880ee85584854ff1a09b1f62 100644 (file)
@@ -452,14 +452,15 @@ static int ShowController(vlc_object_t *p_this, const char *psz_variable,
                      vlc_value_t old_val, vlc_value_t new_val, void *param)
 {
     intf_thread_t * p_intf = VLCIntf;
-    if (p_intf && p_intf->p_sys) {
+    if (p_intf) {
         playlist_t * p_playlist = pl_Get(p_intf);
         BOOL b_fullscreen = var_GetBool(p_playlist, "fullscreen");
-        if (strcmp(psz_variable, "intf-toggle-fscontrol") || b_fullscreen)
+        if (b_fullscreen)
             [[VLCMain sharedInstance] performSelectorOnMainThread:@selector(showFullscreenController) withObject:nil waitUntilDone:NO];
-        else
+        else if (!strcmp(psz_variable, "intf-show"))
             [[VLCMain sharedInstance] performSelectorOnMainThread:@selector(showMainWindow) withObject:nil waitUntilDone:NO];
     }
+
     return VLC_SUCCESS;
 }