release: 1.3.142

[lilypond.git] / lily / thread-devnull-engraver.cc

diff --git a/lily/thread-devnull-engraver.cc b/lily/thread-devnull-engraver.cc
index 83c1f2a36f6db13778afcf8b5b95f24227e0855f..9e995b2f741183c2c7a23dfc16c7a0e218d7763b 100644 (file)
--- a/lily/thread-devnull-engraver.cc
+++ b/lily/thread-devnull-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
@@ -27,16 +27,19 @@ Thread_devnull_engraver::acknowledge_grob (Grob_info i)
 {
   SCM s = get_property ("devNullThread");
 #if 0
-  /* No need */
-  if (gh_equal_p (s, ly_symbol2scm ("never")))
+  /* No need, next if will never be true */
+  if (s == ly_symbol2scm ("never"))
     return;
 #endif
 
-  if (gh_equal_p (s, ly_symbol2scm ("allways"))
+  if (s == ly_symbol2scm ("allways")
       || (s == SCM_EOL
          && daddy_trans_l_->id_str_.left_str (3) == "two"
          && (to_boolean (get_property ("unison"))
              || to_boolean (get_property ("unisilence")))
          && to_boolean (get_property ("soloADue"))))
-    i.elem_l_->suicide ();
+    {
+      /* Ugh, we can suicide them, but they remain living */
+      i.elem_l_->suicide ();
+    }
 }