From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 9 Sep 2003 07:57:44 +0000 (+0000)
Subject: (stop_translation_timestep): backport
X-Git-Tag: release/1.8.2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=96b81879d0ca66736449473702c272b8fd7a7e60;p=lilypond.git

(stop_translation_timestep): backport
of glissando bugfix.
---

diff --git a/ChangeLog b/ChangeLog
index f2a3c78721..130b328594 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-09  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* lily/glissando-engraver.cc (stop_translation_timestep): backport
+	of glissando bugfix.
+
 2003-09-05  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 	* Documentation/user/tutorial.itely (More about pitches and
diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc
index 9435968bd3..f74cad1af4 100644
--- a/lily/glissando-engraver.cc
+++ b/lily/glissando-engraver.cc
@@ -55,8 +55,6 @@ Glissando_engraver::process_music ()
 {
   if (event_)
     {
-      last_line_ = line_;
-      
       line_ = new Spanner (get_property ("Glissando"));
       announce_grob (line_, event_->self_scm ());
     }
@@ -87,7 +85,12 @@ Glissando_engraver::stop_translation_timestep ()
       last_line_ =0;
     }
 
-  last_line_ = line_;
+ if (line_)
+    {
+      if ( last_line_)
+	programming_error ("Overwriting glissando.");
+      last_line_ = line_;
+    }
   line_ = 0;
   event_ = 0;
 }