stepmake/stepmake/generic-targets.make (cvs-clean): also remove out-www dirs.

[lilypond.git] / lily / context-specced-music-iterator.cc

diff --git a/lily/context-specced-music-iterator.cc b/lily/context-specced-music-iterator.cc
index 06fa347912fe7da4a86f2444b5a5517fc6a8e467..86342a5eb422722976d8155ae43d0ffb5af758e9 100644 (file)
--- a/lily/context-specced-music-iterator.cc
+++ b/lily/context-specced-music-iterator.cc
@@ -22,7 +22,7 @@ Context_specced_music_iterator::construct_children ()
 {
   SCM ct = get_music ()->get_property ("context-type");
 
-  String c_id;
+  string c_id;
   SCM ci = get_music ()->get_property ("context-id");
   if (scm_is_string (ci))
     c_id = ly_scm2string (ci);
@@ -30,8 +30,8 @@ Context_specced_music_iterator::construct_children ()
 
   Context *a = 0;
 
-  if (c_id == "$uniqueContextId")
-    a = get_outlet ()->create_unique_context (ct, ops);
+  if (to_boolean (get_music()->get_property ("create-new")))
+    a = get_outlet ()->create_unique_context (ct, c_id, ops);
   else
     a = get_outlet ()->find_create_context (ct, c_id, ops);