input/test fixes

[lilypond.git] / lily / relative-octave-music.cc

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index ad9f617e2969491320002c955a855ab305499f24..fde9c2f8351155f1ec1e1f4abf8392d1f1764e28 100644 (file)
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -17,16 +17,14 @@ Relative_octave_music::to_relative_octave (Pitch p)
   if (lily_1_8_relative)
     {
       lily_1_8_compatibility_used = true;
-      /*
-       ugh: last-pitch should  be junked.
+      /*  last-pitch should be junked some time, when
+         we ditch 1.8 compat too.
 
-       Change this for lilypond 2.0. When you do,
-       then B should start where A left off.
+        When you do, B should start where A left off.
 
-       \relative { A \relative { ...} B }
-
-      */
-      return * unsmob_pitch (get_property ("last-pitch"));
+       \relative { A \relative { ...} B }  */
+      Pitch *ptr = unsmob_pitch (get_property ("last-pitch"));
+      return (ptr) ?  *ptr : p;
     }
   else
     return p;