From: Benjamin Pracht <bigben@videolan.org>
Date: Sun, 20 Nov 2005 16:05:12 +0000 (+0000)
Subject: * fix an ordering bug in D'n'D
X-Git-Tag: 0.9.0-test0~13266
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=933e35601ce52a8960bb1eb093bb4e688f44911b;p=vlc

* fix an ordering bug in D'n'D
---

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index e650989125..7fece4594c 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -1657,10 +1657,8 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
         /* If the item is to be dropped as root item of the outline, make it a
            child of the General node.
            Else, choose the proposed parent as parent. */
-        if( item == nil )
-        p_new_parent = p_playlist->p_general;
-        else
-        p_new_parent = [item pointerValue];
+        if( item == nil ) p_new_parent = p_playlist->p_general;
+        else p_new_parent = [item pointerValue];
 
         /* Make sure the proposed parent is a node.
            (This should never be true) */
@@ -1709,8 +1707,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
                 else
                 {
                     if ((p_new_parent == p_old_parent &&
-                                   i_old_index < index + (int)i)
-                                   || p_new_parent == p_playlist->p_general )
+                                   i_old_index < index + (int)i) )
                     {
                         i_removed_from_node++;
                     }