]> git.lyx.org Git - lyx.git/commitdiff
Allow an unnamed buffer to be saved with the same name
authorVincent van Ravesteijn <vfr@lyx.org>
Mon, 14 May 2012 13:26:51 +0000 (15:26 +0200)
committerVincent van Ravesteijn <vfr@lyx.org>
Mon, 14 May 2012 13:26:51 +0000 (15:26 +0200)
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.

src/frontends/qt4/GuiView.cpp

index d13fee55cd3864058b1f2a00ced17bac11a7ad15..f6c6a93b2e272f3cdb27021d166c710acec7db6b 100644 (file)
@@ -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"