X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fvolta-repeat-iterator.cc;h=09c2495f05dae8febe0184981b174d2f1d3cedf1;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=110053686fd2ed6bb4479eca653567e237a9cae6;hpb=2c633c806d4f1c760bec4a1da90e0e0011102d7a;p=lilypond.git

diff --git a/lily/volta-repeat-iterator.cc b/lily/volta-repeat-iterator.cc
index 110053686f..09c2495f05 100644
--- a/lily/volta-repeat-iterator.cc
+++ b/lily/volta-repeat-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2002--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -53,6 +53,7 @@ void
 Volta_repeat_iterator::derived_mark () const
 {
   scm_gc_mark (alt_restores_);
+  Sequential_iterator::derived_mark ();
 }
 
 SCM
@@ -131,13 +132,15 @@ Volta_repeat_iterator::next_element (bool side_effect)
               add_repeat_command (scm_list_n (ly_symbol2scm ("volta"), SCM_BOOL_F, SCM_UNDEFINED));
 
               if (done_count_ - 1 < alt_count_)
-                add_repeat_command (ly_symbol2scm ("end-repeat"));
-
-              if (to_boolean (get_outlet ()->get_property ("timing")))
                 {
-                  for (SCM p = alt_restores_; scm_is_pair (p); p = scm_cdr (p))
-                    scm_apply_0 (ly_lily_module_constant ("ly:context-set-property!"),
-                                 scm_car (p));
+                  add_repeat_command (ly_symbol2scm ("end-repeat"));
+
+                  if (to_boolean (get_outlet ()->get_property ("timing")))
+                    {
+                      for (SCM p = alt_restores_; scm_is_pair (p); p = scm_cdr (p))
+                        scm_apply_0 (ly_lily_module_constant ("ly:context-set-property!"),
+                                     scm_car (p));
+                    }
                 }
             }