]> git.donarmstrong.com Git - lilypond.git/commitdiff
Issue 3792: \time change under last \alternative does not persist
authorDavid Kastrup <dak@gnu.org>
Mon, 13 Jan 2014 11:45:33 +0000 (12:45 +0100)
committerDavid Kastrup <dak@gnu.org>
Sat, 18 Jan 2014 15:02:47 +0000 (16:02 +0100)
lily/volta-repeat-iterator.cc

index c9ffaf816e68cc83671a44a39a9f101e8ec6c9f5..0774ca07e8c962d2932377e3af7037a48b9ec4cb 100644 (file)
@@ -132,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));
+                    }
                 }
             }