From 5dbd60e9d472a2653ce64c3cc273f45edb5b85f5 Mon Sep 17 00:00:00 2001
From: Matthias Neeracher <neeracher@mac.com>
Date: Sat, 10 Sep 2011 23:17:14 +0200
Subject: [PATCH] ... but respect lyrics if set

---
 Sources/VLModel.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Sources/VLModel.cpp b/Sources/VLModel.cpp
index 2a6d426..7622cca 100644
--- a/Sources/VLModel.cpp
+++ b/Sources/VLModel.cpp
@@ -629,10 +629,12 @@ void VLSong::AddNote(VLLyricsNote note, size_t measure, VLFraction at)
                     }
 				}
                 //
-                // Deliberately leave fLyrics alone
+                // Deliberately leave fLyrics alone unless set in incoming note
                 //
                 i->fPitch       = note.fPitch;
                 i->fVisual      = note.fVisual;
+                if (note.fLyrics.size())
+                    i->fLyrics  = note.fLyrics;
 			} else {
 				//
 				// Overlap, split current