macosx: Never try to find an input anywhere, but get the playlist input using pl_Curr...

[vlc] / modules / gui / macosx / controls.m

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index c68b57517b548bc855b5be275b8731e3f45393ad..bbd35e275a069b37b90324fb3f098f9dd27aeba4 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -499,6 +499,7 @@
             }
             else
             {
+                /* Fullscreen state for next time will be saved here too */
                 [o_vout_view toggleFullscreen];
             }
         }
@@ -516,7 +517,7 @@
             var_Set( p_playlist, "fullscreen", (vlc_value_t)!val.b_bool );
         }
 
-        vlc_object_release( p_playlist );
+        pl_Release( VLCIntf );
     }
 
 }
@@ -810,8 +811,7 @@
     }
     else if( sender == o_specificTime_ok_btn )
     {
-        input_thread_t * p_input = (input_thread_t *)vlc_object_find( VLCIntf, \
-            VLC_OBJECT_INPUT, FIND_ANYWHERE );
+        input_thread_t * p_input = pl_CurrentInput( VLCIntf );
         if( p_input )
         {
             unsigned int timeInSec = 0;
@@ -840,14 +840,13 @@
             input_Control( p_input, INPUT_SET_TIME, (int64_t)(timeInSec * 1000000));
             vlc_object_release( p_input );
         }
- 
+
         [NSApp endSheet: o_specificTime_win];
         [o_specificTime_win close];
     }
     else
     {
-        input_thread_t * p_input = (input_thread_t *)vlc_object_find( VLCIntf, \
-            VLC_OBJECT_INPUT, FIND_ANYWHERE );
+        input_thread_t * p_input = pl_CurrentInput( VLCIntf );
         if( p_input )
         {
             /* we can obviously only do that if an input is available */
@@ -987,9 +986,10 @@
                     break;
                 }
             }
+
             vlc_object_release( (vlc_object_t *)p_vout );
         }
-        else if( [[o_mi title] isEqualToString: _NS("Fullscreen")] )
+        if( [[o_mi title] isEqualToString: _NS("Fullscreen")] )
         {
             var_Get( p_playlist, "fullscreen", &val );
             [o_mi setState: val.b_bool];