[MPlayer-cvslog] r27106 - trunk/playtree.c

[ben]

Author: ben
Date: Fri Jun 20 21:51:43 2008
New Revision: 27106

Log:

Only "pop" subtree params if they had previously been "pushed",
and afterwards reset the "pushed" value to 0 again.
Similarly only set the PLAY_TREE_RND_PLAYED flag
if the entry had been pushed before.



Modified:
   trunk/playtree.c

Modified: trunk/playtree.c
==============================================================================
--- trunk/playtree.c	(original)
+++ trunk/playtree.c	Fri Jun 20 21:51:43 2008
@@ -710,8 +710,9 @@ play_tree_iter_up_step(play_tree_iter_t*
   iter->tree = iter->tree->parent;
 
   // Pop subtree params
-  if(iter->config) {
+  if(iter->config && iter->entry_pushed > 0) {
     m_config_pop(iter->config);
+    iter->entry_pushed = 0;
     if(iter->mode == PLAY_TREE_ITER_RND)
       iter->tree->flags |= PLAY_TREE_RND_PLAYED;
   }