From: David Kastrup <dak@gnu.org>
Date: Sat, 4 Feb 2017 23:31:37 +0000 (+0100)
Subject: Issue 5057/6: Stop SCM/int confusion in Drum_notes_engraver
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=2b8ee231c92ec9f728adae7e48a3e0ddb1a8b22f

Issue 5057/6: Stop SCM/int confusion in Drum_notes_engraver
---

diff --git a/lily/drum-note-engraver.cc b/lily/drum-note-engraver.cc
index e358d8e0d6..73bec0ed9f 100644
--- a/lily/drum-note-engraver.cc
+++ b/lily/drum-note-engraver.cc
@@ -63,12 +63,12 @@ Drum_notes_engraver::listen_note (Stream_event *ev)
 void
 Drum_notes_engraver::process_music ()
 {
-  SCM tab = 0;
+  if (events_.empty ())
+    return;
+
+  SCM tab = get_property ("drumStyleTable");
   for (vsize i = 0; i < events_.size (); i++)
     {
-      if (!tab)
-        tab = get_property ("drumStyleTable");
-
       Stream_event *ev = events_[i];
       Item *note = make_item ("NoteHead", ev->self_scm ());