From: Vincent van Ravesteijn Date: Sun, 19 May 2013 10:28:11 +0000 (+0200) Subject: Fix assertion: icon in insetinfo without a font X-Git-Tag: 2.1.0beta1~212 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8a403368485ce1fa6313adbe9c6e45afb49583cb;p=features.git Fix assertion: icon in insetinfo without a font InsetInfos of the type ICON have a graphics Inset in their paragraph. These insets were inserted without a font. This lead to an assertion in Paragraph::fontSpan because the fontlist_ of the paragraph is empty. --- diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp index 2b9b231903..d914d94938 100644 --- a/src/insets/InsetInfo.cpp +++ b/src/insets/InsetInfo.cpp @@ -381,7 +381,7 @@ void InsetInfo::updateInfo() // do not insert > for the top level menu item if (it != beg) par.insertInset(par.size(), new InsetSpecialChar(InsetSpecialChar::MENU_SEPARATOR), - Change(Change::UNCHANGED)); + f, Change(Change::UNCHANGED)); //FIXME: add proper underlines here. This // involves rewriting searchMenu used above to // return a vector of menus. If we do not do @@ -412,7 +412,8 @@ void InsetInfo::updateInfo() igp.filename = file; inset->setParams(igp); clear(); - paragraphs().front().insertInset(0, inset, + Font const f(inherit_font, buffer().params().language); + paragraphs().front().insertInset(0, inset, f, Change(Change::UNCHANGED)); break; }