Run `make grand-replace'.

[lilypond.git] / lily / music-wrapper.cc

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 456af661cc339379d0e9d30150584be71002789c..7635c731f624f7ffa1c8c825d169d6ea717d890e 100644 (file)
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music-wrapper.hh"
@@ -16,7 +16,10 @@ Music_wrapper::start_callback (SCM m)
 {
   Music *me = unsmob_music (m);
   Music *elt = unsmob_music (me->get_property ("element"));
-  return elt->start_mom ().smobbed_copy ();
+  if (elt)
+    return elt->start_mom ().smobbed_copy ();
+  else
+    return Moment ().smobbed_copy ();
 }
 
 MAKE_SCHEME_CALLBACK (Music_wrapper, length_callback, 1);
@@ -25,6 +28,9 @@ Music_wrapper::length_callback (SCM m)
 {
   Music *me = unsmob_music (m);
   Music *elt = unsmob_music (me->get_property ("element"));
-  return elt->get_length ().smobbed_copy ();
+  if (elt)
+    return elt->get_length ().smobbed_copy ();
+  else
+    return Moment (0).smobbed_copy ();
 }