X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftiming-engraver.cc;h=29ee1d6d8c508f29f03e69e1f2c4e30a432a0e76;hb=3a0e9efb7f067e5b334ba0596b95e15d96d7cc49;hp=3fa208f15d6269026d7a76f5408a104a6f4fcbe1;hpb=8002fa018c81f70585c25232247c6dcba7f5cba0;p=lilypond.git

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index 3fa208f15d..29ee1d6d8c 100644
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -53,12 +53,15 @@ Timing_engraver::which_bar ()
       if (!now_mom ())
 	return "|";
 
-      Scalar nonauto = get_property ("barNonAuto", 0);
-      if (!nonauto.to_bool ())
+      SCM nonauto = get_property ("barNonAuto", 0);
+      if (!gh_boolean_p (nonauto) && gh_scm2bool (nonauto))
 	{
-	  Scalar always = get_property ("barAlways", 0);
-	  if (!time_.whole_in_measure_ || always.to_bool ())
-	    return get_property ("defaultBarType" ,0);
+	  SCM always = get_property ("barAlways", 0);
+	  if (!time_.whole_in_measure_ || gh_boolean_p (always) && gh_scm2bool (always))
+	    {
+	      SCM def=get_property ("defaultBarType" ,0);
+	      return (gh_string_p (def))? ly_scm2string (def) : "";
+	    }
 	}
       return "";
     }