From 1379c381c30c08500ff321d1e6a46323b667c98f Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 18 May 2014 18:08:43 +0200 Subject: [PATCH] Fix crash when right-clicking into an inset with more paragraphs than the main text. Fixes: #9123. --- src/frontends/qt4/Menus.cpp | 4 ++-- status.21x | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp index 8e9fd54b6e..7911c162a1 100644 --- a/src/frontends/qt4/Menus.cpp +++ b/src/frontends/qt4/Menus.cpp @@ -1667,7 +1667,7 @@ void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv) return; pit_type pit = bv->cursor().selBegin().pit(); - Paragraph const & par = bv->buffer().text().getPar(pit); + Paragraph const & par = bv->cursor().text()->getPar(pit); docstring const curlayout = par.layout().name(); docstring outerlayout; depth_type current_depth = par.params().depth(); @@ -1677,7 +1677,7 @@ void MenuDefinition::expandEnvironmentSeparators(BufferView const * bv) if (pit == 0 || cpar.params().depth() == 0) break; --pit; - cpar = bv->buffer().text().getPar(pit); + cpar = bv->cursor().text()->getPar(pit); if (cpar.params().depth() < current_depth && cpar.layout().isEnvironment()) { outerlayout = cpar.layout().name(); diff --git a/status.21x b/status.21x index bfa64845d9..d7e92a2537 100644 --- a/status.21x +++ b/status.21x @@ -87,6 +87,9 @@ What's new * USER INTERFACE +- Fix crash when right-clicking into an insets with more paragraphs than the + main text (bug 9123). + - Fix crash when entering math in change-tracking mode while merge changes dialog is open (bug 7685).