From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Mon, 14 May 2012 13:26:51 +0000 (+0200)
Subject: Allow an unnamed buffer to be saved with the same name
X-Git-Tag: 2.1.0beta1~1867
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=30475664d380474f4ea0666e9aaf006cf22c1c7e;p=lyx.git

Allow an unnamed buffer to be saved with the same name

The check whether fname != oldname does not work for unnamed buffers.
Therefore, we check explicitly whether the Buffer that already exists with
the same name isn't really the buffer we are trying to save.
---

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index d13fee55cd..f6c6a93b2e 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2286,7 +2286,8 @@ bool GuiView::renameBuffer(Buffer & b, docstring const & newname)
 	// if there is already a Buffer open with this name, we do not want
 	// to have another one. (the second test makes sure we're not just
 	// trying to overwrite ourselves, which is fine.)
-	if (theBufferList().exists(fname) && fname != oldname) {
+	if (theBufferList().exists(fname) && fname != oldname
+		  && theBufferList().getBuffer(fname) != &b) {
 		docstring const text = 
 			bformat(_("The file\n%1$s\nis already open in your current session.\n"
 		            "Please close it before attempting to overwrite it.\n"