From: Keith OHara <k-ohara5a5a@oco.net>
Date: Sat, 24 Aug 2013 21:48:18 +0000 (-0700)
Subject: accidental.cc: do not crash on missing stencils
X-Git-Tag: release/2.17.25-1~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7865d5d86739bd3cf8cb675892442f9484d4bfd0;p=lilypond.git

accidental.cc: do not crash on missing stencils
---

diff --git a/lily/accidental.cc b/lily/accidental.cc
index 0cf270f52a..ce05dfff72 100644
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -83,14 +83,14 @@ Accidental_interface::horizontal_skylines (SCM smob)
    * We use the more basic get_stencil.
    */
   Stencil *my_stencil = unsmob_stencil (get_stencil (me));
+  if (!my_stencil)
+    return Skyline_pair ().smobbed_copy ();
+
   Skyline_pair *sky =
     Skyline_pair::unsmob
       (Stencil::skylines_from_stencil
         (my_stencil->smobbed_copy (), 0.0, Y_AXIS));
 
-  if (!sky)
-    return Skyline_pair ().smobbed_copy ();
-
   SCM alist = me->get_property ("glyph-name-alist");
   SCM alt = me->get_property ("alteration");
   string glyph_name = robust_scm2string (ly_assoc_get (alt, alist, SCM_BOOL_F),