Fix fa0f142e (plain quotes fix).

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index a20b4da3db5abdc18e77603eb21493e267e159b9..436b0a8ba3cac0ba666aec9c6b52ef4596a64bdd 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -553,7 +553,11 @@ Buffer::~Buffer()
 
                if (!isClean()) {
                        docstring msg = _("LyX attempted to close a document that had unsaved changes!\n");
-                       msg += emergencyWrite();
+                       try {
+                               msg += emergencyWrite();
+                       } catch (...) {
+                               msg += "  " + _("Save failed! Document is lost.");
+                       }
                        Alert::warning(_("Attempting to close changed document!"), msg);
                }
 
@@ -725,7 +729,7 @@ BufferParams const & Buffer::masterParams() const
 double Buffer::fontScalingFactor() const
 {
        return isExporting() ? 75.0 * params().html_math_img_scale
-               : 0.01 * lyxrc.dpi * lyxrc.zoom * lyxrc.preview_scale_factor * params().display_pixel_ratio;
+               : 0.01 * lyxrc.dpi * lyxrc.currentZoom * lyxrc.preview_scale_factor * params().display_pixel_ratio;
 }
 
 
@@ -1313,7 +1317,7 @@ Buffer::ReadStatus Buffer::convertLyXFormat(FileName const & fn,
        command << os::python()
                << ' ' << quoteName(lyx2lyx.toFilesystemEncoding())
                << " -t " << convert<string>(LYX_FORMAT)
-               << " -o " << quoteName(tmpfile.toFilesystemEncoding())
+               << " -o " << quoteName(tmpfile.toSafeFilesystemEncoding())
                << ' ' << quoteName(fn.toSafeFilesystemEncoding());
        string const command_str = command.str();
 
@@ -1606,7 +1610,7 @@ docstring Buffer::emergencyWrite()
                return user_message;
        }
 
-       user_message += "  " + _("Save failed! Bummer. Document is lost.");
+       user_message += "  " + _("Save failed! Document is lost.");
        // Don't try again.
        markClean();
        return user_message;
@@ -3945,6 +3949,7 @@ unique_ptr<TexRow> Buffer::getSourceCode(odocstream & os, string const & format,
                        ots.texrow().newlines(2);
                        if (master)
                                runparams.is_child = true;
+                       updateBuffer();
                        writeLaTeXSource(ots, string(), runparams, output);
                        texrow = ots.releaseTexRow();
                }