X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer_funcs.cpp;h=17aab767c2c91c04b3a86a78533a7c5d97cd87da;hb=cca78e3c8ae27431323746abd64f9d7db017099d;hp=21d9e1a9a00c38bf3d77877d8b397fbdbfacb9e6;hpb=5ac9db6dfc52371ae8a3d46eea231306c2a85754;p=lyx.git

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 21d9e1a9a0..17aab767c2 100644
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -60,7 +60,7 @@ namespace Alert = frontend::Alert;
 Buffer * checkAndLoadLyXFile(FileName const & filename)
 {
 	// File already open?
-	Buffer * checkBuffer = theBufferList().getBuffer(filename.absFilename());
+	Buffer * checkBuffer = theBufferList().getBuffer(filename);
 	if (checkBuffer) {
 		if (checkBuffer->isClean())
 			return checkBuffer;
@@ -466,7 +466,6 @@ void updateLabels(Buffer const & buf, ParIterator & parit)
 		InsetList::const_iterator end = parit->insetList().end();
 		for (; iit != end; ++iit) {
 			parit.pos() = iit->pos;
-			iit->inset->setBuffer(const_cast<Buffer &>(buf));
 			iit->inset->updateLabels(parit);
 		}
 	}
@@ -491,19 +490,13 @@ void updateLabels(Buffer const & buf, bool childonly)
 		// start over the counters
 		textclass.counters().reset();
 		buf.clearReferenceCache();
+		buf.inset().setBuffer(const_cast<Buffer &>(buf));
 		buf.updateMacros();
 	}
 
 	Buffer & cbuf = const_cast<Buffer &>(buf);
 
-	if (buf.text().empty()) {
-		// FIXME: we don't call continue with updateLabels()
-		// here because it crashes on newly created documents.
-		// But the TocBackend needs to be initialised
-		// nonetheless so we update the tocBackend manually.
-		cbuf.tocBackend().update();
-		return;
-	}
+	BOOST_ASSERT(!buf.text().paragraphs().empty());
 
 	// do the real work
 	ParIterator parit = par_iterator_begin(buf.inset());