* make sure that the opened media is always enqueueded, if macosx-autoplay is false

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index fae21c97adc3d5bb729258a340e7d9bf11abeccd..e3da93f86316655d8002802ad74b6ebc331a1e62 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -666,9 +666,12 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (BOOL)application:(NSApplication *)o_app openFile:(NSString *)o_filename
 {
+    BOOL b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
     NSDictionary *o_dic = [NSDictionary dictionaryWithObjectsAndKeys: o_filename, @"ITEM_URL", nil];
-    [o_playlist appendArray:
-        [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO];
+    if( b_autoplay )
+        [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO];
+    else
+        [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: YES];
 
     return( TRUE );
 }

diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m
index 89cb25ed2cee28fbe29b229b6aab0af6c4386b74..ae0fc3e862c2c2c2a31782ed0c5221ac20c55dbd 100644 (file)
--- a/modules/gui/macosx/misc.m
+++ b/modules/gui/macosx/misc.m
@@ -175,6 +175,7 @@
     NSArray *o_types = [NSArray arrayWithObjects: NSFilenamesPboardType, nil];
     NSString *o_desired_type = [o_paste availableTypeFromArray:o_types];
     NSData *o_carried_data = [o_paste dataForType:o_desired_type];
+    BOOL b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
 
     if( o_carried_data )
     {
@@ -191,7 +192,10 @@
                 o_dic = [NSDictionary dictionaryWithObject:[o_values objectAtIndex:i] forKey:@"ITEM_URL"];
                 o_array = [o_array arrayByAddingObject: o_dic];
             }
-            [[[VLCMain sharedInstance] getPlaylist] appendArray: o_array atPos: -1 enqueue:NO];
+            if( b_autoplay )
+                [[[VLCMain sharedInstance] getPlaylist] appendArray: o_array atPos: -1 enqueue:NO];
+            else
+                [[[VLCMain sharedInstance] getPlaylist] appendArray: o_array atPos: -1 enqueue:YES];
             return YES;
         }
     }