release: 1.3.64

[lilypond.git] / lily / score-engraver.cc

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index b84406fa151f2a95b761210f9924d4d9ccd984d2..e9e530f2e84bcc84efe42b9b9f17c0690d57531b 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -181,12 +181,8 @@ Score_engraver::set_columns (Paper_column *new_command_l,
     {
       if (*current[i])
        {
-         if ((*current[i])->used_b())
-
-           {
              scoreline_l_->add_column ((*current[i]));
-           }
-         else
+         if (!(*current[i])->used_b())
            {
              /*
                We're forgetting about this column. Dump it, and make SCM
@@ -197,7 +193,7 @@ Score_engraver::set_columns (Paper_column *new_command_l,
                even prevent this.
 
              */
-             scm_unprotect_object ((*current[i])->self_scm_);
+               (*current[i])->suicide ();
              *current[i]  =0;
            }
        }