Reset counters before we re-run updateBuffer when the bibfiles change.

Fixes a bug reported by Pavel here:
  https://marc.info/?l=lyx-devel&m=152407889727665&w=2

(cherry picked from commit 64acc06b919e08001cb8ff8d5b69e0902176fe35)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 4d9973a89ccb943ab198f957a6a1c74a44c31c90..d3e7e6b4658a9b0302845073bc1c7d6a934ded78 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -4799,10 +4799,18 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
                // labels. Nothing else will have changed. So we could create a new 
                // UpdateType that would signal that fact, if we needed to do so.
                parit = cbuf.par_iterator_begin();
+               // we will be re-doing the counters and references and such.
+               textclass.counters().reset();
+               clearReferenceCache();
+               // we should not need to do this again?
+               // updateMacros();
+               setChangesPresent(false);
                updateBuffer(parit, utype);
        }
-       else
+       else {
+               // this is also set to true on the other path, by reloadBibInfoCache.
                d->bibinfo_cache_valid_ = true;
+       }
        d->cite_labels_valid_ = true;
        /// FIXME: Perf
        cbuf.tocBackend().update(true, utype);

diff --git a/status.23x b/status.23x
index 26a71a3cc7ed10547d42827c3231886cc4d7c658..fbd0357978bac064b5f0ccb2488c6e4455287ef4 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -210,6 +210,8 @@ What's new
 
 - Allow for spaces in bibliography keys (bug 9847).
 
+- Fix weird bug with counters when reloading with emergency file.
+
 
 * INTERNALS