]> git.sesse.net Git - vlc/commitdiff
* skins2/controls/ctrl_tree.cpp: I forgot 1 occurrence of the bug
authorOlivier Teulière <ipkiss@videolan.org>
Mon, 17 Apr 2006 15:26:53 +0000 (15:26 +0000)
committerOlivier Teulière <ipkiss@videolan.org>
Mon, 17 Apr 2006 15:26:53 +0000 (15:26 +0000)
modules/gui/skins2/controls/ctrl_tree.cpp

index 108d1ff7bd780463d5a7bde7dd1b27f82af06bdb..f89e075987e212aea78c0d0d83a626799a4b5db5 100644 (file)
@@ -792,7 +792,7 @@ void CtrlTree::makeImage()
                 {
                     it = m_flat ? m_rTree.getNextLeaf( it )
                                 : m_rTree.getNextVisibleItem( it );
-                } while( it->m_deleted );
+                } while( it != m_rTree.end() && it->m_deleted );
             }
             else
             {
@@ -856,9 +856,10 @@ void CtrlTree::makeImage()
             yPos += (pText->getHeight() - ySrc );
             delete pText;
         }
-        do {
-        it = m_flat ? m_rTree.getNextLeaf( it )
-                    : m_rTree.getNextVisibleItem( it );
+        do
+        {
+            it = m_flat ? m_rTree.getNextLeaf( it )
+                : m_rTree.getNextVisibleItem( it );
         } while( it != m_rTree.end() && it->m_deleted );
     }
     stats_TimerStop( getIntf(), STATS_TIMER_SKINS_PLAYTREE_IMAGE );