X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.C;h=5bb3ed0b0f6343d64e942c139eba72a20b29fa2d;hb=e5a46922e916a06ad1b958d5895cc3cfb4f13d2c;hp=d1b0e76b56fe8f37e86083d04e1939e0f91197cb;hpb=96512e74cb4cc3b0881e953f7d56ba1737ec3a77;p=lyx.git diff --git a/src/buffer_funcs.C b/src/buffer_funcs.C index d1b0e76b56..5bb3ed0b0f 100644 --- a/src/buffer_funcs.C +++ b/src/buffer_funcs.C @@ -550,15 +550,23 @@ void setLabel(Buffer const & buf, ParIterator & it, LyXTextClass const & textcla } else if (layout->labeltype == LABEL_SENSITIVE) { // Search for the first float or wrap inset in the iterator size_t i = it.depth(); - InsetBase * in; + InsetBase * in = 0; while (i > 0) { --i; - in = &it[i].inset(); - if (in->lyxCode() == InsetBase::FLOAT_CODE - || in->lyxCode() == InsetBase::WRAP_CODE) + InsetBase::Code const code = it[i].inset().lyxCode(); + if (code == InsetBase::FLOAT_CODE || + code == InsetBase::WRAP_CODE) { + in = &it[i].inset(); break; + } } - docstring const & type = in->getInsetName(); + // FIXME Can getInsetName() return an empty name for wide or + // float insets? If not we can put the definition of type + // inside the if (in) clause and use that instead of + // if (!type.empty()). + docstring type; + if (in) + type = in->getInsetName(); if (!type.empty()) { Floating const & fl = textclass.floats().getType(to_ascii(type));