Fix bug #7657: Detect inkscape from the configure script

[lyx.git] / src / Buffer.cpp

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 829616a20548208a5f6d8bfd47a58317303461be..60a36b39eab5607fad32c31247ad3c057b6c3662 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1588,7 +1588,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 
        // XeTeX with TeX fonts is only safe with ASCII encoding,
        // See #9740 and FIXME in BufferParams::encoding()
-       if (params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX))
+       if (!params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX))
                runparams.encoding = encodings.fromLyXName("ascii");
 
        string const encoding = runparams.encoding->iconvName();
@@ -1675,7 +1675,7 @@ void Buffer::writeLaTeXSource(otexstream & os,
 
        // XeTeX with TeX fonts is only safe with ASCII encoding,
        // See #9740 and FIXME in BufferParams::encoding()
-       if (params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX))
+       if (!params().useNonTeXFonts && (runparams.flavor == OutputParams::XETEX))
                runparams.encoding = encodings.fromLyXName("ascii");
 
        // If we are compiling a file standalone, even if this is the
@@ -2440,7 +2440,7 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 
        case LFUN_BUFFER_VIEW_CACHE:
                (d->preview_file_).refresh();
-               enable = (d->preview_file_).exists();
+               enable = (d->preview_file_).exists() && !(d->preview_file_).isFileEmpty();
                break;
 
        default:
@@ -3435,7 +3435,7 @@ Buffer::References & Buffer::getReferenceCache(docstring const & label)
                return it->second.second;
 
        static InsetLabel const * dummy_il = 0;
-       static References const dummy_refs;
+       static References const dummy_refs = References();
        it = d->ref_cache_.insert(
                make_pair(label, make_pair(dummy_il, dummy_refs))).first;
        return it->second.second;