(track_first_item): backport: only return

non-null values.

diff --git a/ChangeLog b/ChangeLog
index e694884b4935bd03bcff116bf4b26434e51ce326..1719da6a3986efd6f4630f5f3c9839f7f33edc05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-23  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scripts/midi2ly.py (track_first_item): backport: only return
+       non-null values.
+
 2005-11-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scripts/lilypond-book.py: quote shell arguments. 

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 7a84bf7bc61b4f32063edf5845a3b31bd88749ec..a259eaa6b935aa7c50f1ec2093cb522a52d54ed5 100644 (file)
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -32,7 +32,7 @@ import sys
 #
 libdir = '@local_lilypond_libdir@'
 if not os.path.isdir (libdir):
-       libdir = '@lilypond_libdir@'
+       libdir = '@lilypond_libdir@'
 
 # ugh
 if os.environ.has_key ('LILYPONDPREFIX'):
@@ -936,7 +936,10 @@ def thread_first_item (thread):
 
 def track_first_item (track):
        for thread in track:
-               return thread_first_item (thread)
+                t = thread_first_item (thread)
+                if t:
+                        return t
+        return None
 
 def guess_clef (track):
        i = 0