From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 23 Nov 2005 10:47:11 +0000 (+0000)
Subject: (track_first_item): backport: only return
X-Git-Tag: release/2.6.5~5
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=e8b0efe3dd5047975601d168932fd6b4cfe3e63d;p=lilypond.git

(track_first_item): backport: only return
non-null values.
---

diff --git a/ChangeLog b/ChangeLog
index e694884b49..1719da6a39 100644
--- 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 7a84bf7bc6..a259eaa6b9 100644
--- 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