Use a `define-builtin-markup-command' macro for builtin markups, which

[lilypond.git] / lily / context.cc

diff --git a/lily/context.cc b/lily/context.cc
index 80a6fb91384eee2adf2f36ec695cbbe907c032ba..d4177e77bfa040018e57a085a68740085c915204 100644 (file)
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -475,6 +475,12 @@ Context::internal_set_property (SCM sym, SCM val
 #endif
                                )
 {
+#ifndef NDEBUG
+  (void) file;
+  (void) line;
+  (void) fun;
+#endif
+
   if (do_internal_type_checking_global)
     assert (type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")));
 
@@ -509,7 +515,9 @@ void
 Context::remove_context (SCM)
 {
   /* ugh, the translator group should listen to RemoveContext events by itself */
-  implementation ()->disconnect_from_context ();
+  Translator_group *impl = implementation ();
+  if (impl)
+    impl->disconnect_from_context ();
   disconnect_from_parent ();
 }