From 64a7513231e7cccbb778c431395bb4f861a70575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Sat, 25 Jul 2009 08:24:21 +0000
Subject: [PATCH] * Text.cpp (dissolveInset): 	- perform updateLabels also
 after dissolving an empty inset (bug 6003).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@30772 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/Text.cpp | 5 ++++-
 status.16x   | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Text.cpp b/src/Text.cpp
index 71a682314d..de263ebc57 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -1236,7 +1236,10 @@ bool Text::dissolveInset(Cursor & cur)
 		// restore position
 		cur.pit() = min(cur.lastpit(), spit);
 		cur.pos() = min(cur.lastpos(), spos);
-	}
+	} else
+		// this is the least that needs to be done (bug 6003)
+		// in the above case, pasteParagraphList handles this
+		updateLabels(cur.buffer());
 	cur.clearSelection();
 	cur.resetAnchor();
 	return true;
diff --git a/status.16x b/status.16x
index 07329e68d0..5dce460a1e 100644
--- a/status.16x
+++ b/status.16x
@@ -165,6 +165,9 @@ What's new
 - Fix a crash when closing a LyX window with split views (bug 5998).
 
 - Fix a crash when applying preference changes (bug 6064).
+
+- Fix a crash when accessing the Navigate menu after an empty inset has
+  been dissolved (bug 6003).
   
 - Fall back to default UI file if the specified one cannot be found
   (bug 6076).