* skins2/controls/ctrl_tree.cpp: Check that the iterator is not end() before using...

   This fixes random freezes when loading skins with a PlayTree control on Windows, and probably some crashes as well.

diff --git a/modules/gui/skins2/controls/ctrl_tree.cpp b/modules/gui/skins2/controls/ctrl_tree.cpp
index c2406b95b8aecf2ed8bf54678474ac89a3a9393d..108d1ff7bd780463d5a7bde7dd1b27f82af06bdb 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_tree.cpp
+++ b/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 );
             }
         }
     }
@@ -859,7 +859,7 @@ void CtrlTree::makeImage()
         do {
         it = m_flat ? m_rTree.getNextLeaf( it )
                     : m_rTree.getNextVisibleItem( it );
-        } while( it->m_deleted );
+        } while( it != m_rTree.end() && it->m_deleted );
     }
     stats_TimerStop( getIntf(), STATS_TIMER_SKINS_PLAYTREE_IMAGE );
 }