* skins2/controls/ctrl_tree.cpp: backport of [15250] and [15251]

modules/gui/skins2/controls/ctrl_tree.cpp

@@ -771,7 +771,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 );
             }
         }
     }
@@ -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,10 +856,11 @@ void CtrlTree::makeImage()
             yPos += (pText->getHeight() - ySrc );
             delete pText;
         }
-        do {
-        it = m_flat ? m_rTree.getNextLeaf( it )
-                    : m_rTree.getNextVisibleItem( it );
-        } while( it->m_deleted );
+        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 );
 }