From 4104cd13a5bd3e1c7e7df20fcee91bbbb819612c Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 21 Apr 2019 09:55:17 +0200
Subject: [PATCH] Fix renaming of citation refs after changing bibitem key

Fixes: #6494
(cherry picked from commit faefee3dc633e90d770f417c344c8047993ca360)
---
 src/insets/InsetBibitem.cpp | 3 ++-
 status.23x                  | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index f9b244c460..596ddf9207 100644
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -155,8 +155,9 @@ void InsetBibitem::doDispatch(Cursor & cur, FuncRequest & cmd)
 		setParam("literal", p["literal"]);
 
 		if (p["key"] != old_key) {
+			cur.recordUndoFullBuffer();
+			cur.bv().buffer().changeRefsIfUnique(old_key, p["key"]);
 			updateCommand(p["key"]);
-			cur.bv().buffer().changeRefsIfUnique(old_key, params()["key"]);
 			cur.forceBufferUpdate();
 			buffer().invalidateBibinfoCache();
 		}
diff --git a/status.23x b/status.23x
index ac02bf39e9..7df75f26d7 100644
--- a/status.23x
+++ b/status.23x
@@ -34,6 +34,9 @@ What's new
 
 - Allow nameref in math references (bug 9798).
 
+- Fix renaming of citation references after changing bibliography key
+  (bug 6494).
+
 - Make tab movement visible (bug 10733).
 
 - Add "Reset" and "Reset All Fields" buttons to Text Properties
@@ -54,7 +57,7 @@ What's new
 - Improve performance on Windows with lots of math insets or very long
   math formulas (bug 11546).
 
-- Add Shortcut (Comand-0) for workaera zoom reset to mac.bind.
+- Add Shortcut (Command-0) for workarwa zoom reset to mac.bind.
 
 - Improve some icons (bug 11476).