X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fglobal-context.cc;h=6e0e1c4379af9b971a00944e2e964414b850742a;hb=d194ee9f637a200ac26b59e818acf5ca37985dc9;hp=40fe3a61cdb7a0b657398fc459bde7a7e6a87ed7;hpb=e09265d8e9ad94714076ca91e63eab5c55679286;p=lilypond.git

diff --git a/lily/global-context.cc b/lily/global-context.cc
index 40fe3a61cd..6e0e1c4379 100644
--- a/lily/global-context.cc
+++ b/lily/global-context.cc
@@ -18,7 +18,6 @@ using namespace std;
 #include "music-iterator.hh"
 #include "music.hh"
 #include "output-def.hh"
-#include "stream-event.hh"
 #include "warn.hh"
 
 Global_context::Global_context (Output_def *o, Object_key *key)
@@ -114,7 +113,11 @@ Global_context::get_score_context () const
 SCM
 Global_context::get_output ()
 {
-  return get_score_context ()->get_property ("output");
+  Context * c = get_score_context ();
+  if (c)
+    return c->get_property ("output");
+  else
+    return SCM_EOL;
 }
 
 void
@@ -136,6 +139,13 @@ Global_context::run_iterator_on_me (Music_iterator *iter)
       if (w.main_part_.is_infinity () || w > final_mom)
 	break;
 
+      if (w == prev_mom_)
+	{
+	  programming_error ("Moment is not increasing. Aborting interpretation.");
+	  break ;
+	}
+
+      
       if (first)
 	{
 	  /*