Skip to content

V
vlc-1.1
Commit 5ce30b7c authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: fixed Reveal-in-Finder when path contains spaces or umlauts 

closes #4721
parent c5c07d26
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 7 deletions
modules/gui/macosx/playlist.m
View file @ 5ce30b7c
...@@ -706,7 +706,7 @@ ...@@ -706,7 +706,7 @@
inNode: (playlist_item_t *)p_node inNode: (playlist_item_t *)p_node
checkItemExistence:(BOOL)b_check checkItemExistence:(BOOL)b_check
{ {
[self isItem:p_item inNode:p_node checkItemExistence:b_check locked:NO]; return [self isItem:p_item inNode:p_node checkItemExistence:b_check locked:NO];
} }
/* This method is useful for instance to remove the selected children of an /* This method is useful for instance to remove the selected children of an
...@@ -891,7 +891,7 @@ ...@@ -891,7 +891,7 @@
if(! p_item || !p_item->p_input ) if(! p_item || !p_item->p_input )
return; return;
char *psz_uri = input_item_GetURI( p_item->p_input ); char *psz_uri = decode_URI( input_item_GetURI( p_item->p_input ) );
if( psz_uri ) if( psz_uri )
o_mrl = [NSMutableString stringWithUTF8String: psz_uri]; o_mrl = [NSMutableString stringWithUTF8String: psz_uri];
...@@ -1586,11 +1586,8 @@ ...@@ -1586,11 +1586,8 @@
/* Refuse to move items that are not in the General Node /* Refuse to move items that are not in the General Node
(Service Discovery) */ (Service Discovery) */
if( ![self isItem: [o_item pointerValue] inNode: if( (![self isItem: [o_item pointerValue] inNode: p_playlist->p_local_category checkItemExistence: NO] &&
p_playlist->p_local_category checkItemExistence: NO] && var_CreateGetBool( p_playlist, "media-library" ) && ![self isItem: [o_item pointerValue] inNode: p_playlist->p_ml_category checkItemExistence: NO]) ||
var_CreateGetBool( p_playlist, "media-library" ) &&
![self isItem: [o_item pointerValue] inNode:
p_playlist->p_ml_category checkItemExistence: NO] ||
[o_item pointerValue] == p_playlist->p_local_category || [o_item pointerValue] == p_playlist->p_local_category ||
[o_item pointerValue] == p_playlist->p_ml_category ) [o_item pointerValue] == p_playlist->p_ml_category )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment