From 1693b9a7b69ed3feefae7921e0b9392bfbf55702 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 20 Apr 2019 19:42:29 +0200
Subject: [PATCH] reset bibitem counter in the second updateBuffer() routine as
 well

Fixes: #8499
---
 src/Buffer.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index eeadf0a4f1..6f53a567db 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -5257,6 +5257,11 @@ void Buffer::updateBuffer(ParIterator & parit, UpdateType utype) const
 	// to resolve macros in it.
 	parit.text()->setMacrocontextPosition(parit);
 
+	// Reset bibitem counter in master (#8499)
+	Buffer const * const master = masterBuffer();
+	if (master == this && !d->ignore_parent)
+		master->params().documentClass().counters().reset(from_ascii("bibitem"));
+
 	depth_type maxdepth = 0;
 	pit_type const lastpit = parit.lastpit();
 	for ( ; parit.pit() <= lastpit ; ++parit.pit()) {
-- 
2.39.5