From: Abdelrazak Younes <younes@lyx.org>
Date: Tue, 4 Dec 2007 23:07:14 +0000 (+0000)
Subject: Avoid a second confirmation when reverting a Buffer.
X-Git-Tag: 1.6.10~7052
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=23aff36f7e4a1ac496ad4cb407b9023a08f2ce31;p=features.git

Avoid a second confirmation when reverting a Buffer.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21963 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 69ddb58c0f..e59c4ba12d 100644
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -2118,11 +2118,13 @@ void LyXFunc::closeBuffer()
 
 void LyXFunc::reloadBuffer()
 {
-	FileName filename(lyx_view_->buffer()->absFileName());
+	FileName filename = lyx_view_->buffer()->fileName();
+	// The user has already confirmed that the changes, if any, should
+	// be discarded. So we just release the Buffer and don't call closeBuffer();
+	theBufferList().release(lyx_view_->buffer());
+	Buffer * buf = loadAndViewFile(filename);
 	docstring const disp_fn = makeDisplayPath(filename.absFilename());
 	docstring str;
-	closeBuffer();
-	Buffer * buf = loadAndViewFile(filename);
 	if (buf) {
 		updateLabels(*buf);
 		lyx_view_->setBuffer(buf);