Commit 5b9ffbc6 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: prevent items from moving from the ml to the pl accidently

(cherry picked from commit 04c60443)
parent 023c81ca
...@@ -1553,10 +1553,17 @@ ...@@ -1553,10 +1553,17 @@
NSArray *o_all_items = [o_nodes_array arrayByAddingObjectsFromArray: NSArray *o_all_items = [o_nodes_array arrayByAddingObjectsFromArray:
o_items_array]; o_items_array];
/* If the item is to be dropped as root item of the outline, make it a /* If the item is to be dropped as root item of the outline, make it a
child of the General node. child of the respective general node, if is either the pl or the ml
Else, choose the proposed parent as parent. */ Else, choose the proposed parent as parent. */
if( item == nil ) p_new_parent = p_playlist->p_local_category; if( item == nil )
else p_new_parent = [item pointerValue]; {
if ([self currentPlaylistRoot] == p_playlist->p_local_category || [self currentPlaylistRoot] == p_playlist->p_ml_category)
p_new_parent = [self currentPlaylistRoot];
else
p_new_parent = p_playlist->p_local_category;
}
else
p_new_parent = [item pointerValue];
/* Make sure the proposed parent is a node. /* Make sure the proposed parent is a node.
(This should never be true) */ (This should never be true) */
......
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