Issue 4439/1: Use Input::non_fatal_error instead of Input::error where appropriate

[lilypond.git] / lily / score.cc

diff --git a/lily/score.cc b/lily/score.cc
index fe0f761fb7bad81ebf8dcdb2077b9d007a1f7097..895954a01abbfc0aa534683c9cc753c72d7bd98b 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -157,22 +157,24 @@ Score::set_music (SCM music)
 {
   if (unsmob<Music> (music_))
     {
-      unsmob<Music> (music)->origin ()->error (_ ("already have music in score"));
-      unsmob<Music> (music_)->origin ()->error (_ ("this is the previous music"));
+      unsmob<Music> (music)->origin ()->non_fatal_error
+        (_ ("already have music in score"));
+      unsmob<Music> (music_)->origin ()->non_fatal_error
+        (_ ("this is the previous music"));
     }
   Music *m = unsmob<Music> (music);
   if (m && to_boolean (m->get_property ("error-found")))
     {
-      m->origin ()->error (_ ("errors found, ignoring music expression"));
+      m->origin ()->non_fatal_error
+        (_ ("errors found, ignoring music expression"));
 
-      this->error_found_ = this->error_found_
-                           || to_boolean (m->get_property ("error-found"));
+      error_found_ = true;
     }
 
-  if (this->error_found_)
-    this->music_ = SCM_EOL;
+  if (error_found_)
+    music_ = SCM_EOL;
   else
-    this->music_ = music;
+    music_ = music;
 }
 
 SCM