Mercurial > mplayer.hg

changeset 27074:242ff412c591

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author ben
date Fri, 20 Jun 2008 19:51:43 +0000
parents d2b26c92559d
children d994e9e0aa93
files playtree.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/playtree.c	Fri Jun 20 19:43:50 2008 +0000
+++ b/playtree.c	Fri Jun 20 19:51:43 2008 +0000
@@ -710,8 +710,9 @@
   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;
   }