* input/regression/{many}.ly: refresh, trying to guess how

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index 4503d1cf7ceeeb4e3bad7f4aa42043120e4002cc..166f916ca68374761efcb8b6cf065e3dc861374b 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -97,8 +97,7 @@ Context::Context ()
 Context *
 Context::find_existing_context (SCM n, String id)
 {
-  if ((is_alias (n) && (id_string_ == id || id.is_empty ()))
-      || n == ly_symbol2scm ("Current"))
+  if ((is_alias (n) && (id_string_ == id || id.is_empty ())))
     return this;
 
   Context* r = 0;
@@ -168,8 +167,12 @@ Context::find_create_context (SCM n, String id,
       return current;
     }
 
+  /*
+    Don't go up to Global_context, because global goes down to
+    Score_context
+   */
   Context *ret = 0;
-  if (daddy_context_)
+  if (daddy_context_ && !dynamic_cast<Global_context*> (daddy_context_))
     ret = daddy_context_->find_create_context (n, id, operations);
   else
     {