Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 7407fc4834852ee69aa86c338eba51f79c65d4ba..069ad92565efa65bd5c56a8f69d94dd68d382082 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -455,7 +455,7 @@ TeXOnePar(Buffer const & buf,
                                OutputParams tmp_rp = runparams;
                                runparams.moving_arg = false;
                                pair<bool, int> enc_switch = switchEncoding(os, bparams, runparams,
-                                       *(runparams.encoding), *encoding);
+                                       *encoding);
                                runparams = tmp_rp;
                                // the following is necessary after a CJK environment in a multilingual
                                // context (nesting issue).
@@ -865,9 +865,9 @@ void latexParagraphs(Buffer const & buf,
 
 
 pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
-                  OutputParams const & runparams, Encoding const & oldEnc,
-                  Encoding const & newEnc)
+                  OutputParams const & runparams, Encoding const & newEnc)
 {
+       Encoding const oldEnc = *runparams.encoding;
        bool moving_arg = runparams.moving_arg;
        if ((bparams.inputenc != "auto" && bparams.inputenc != "default")
                || moving_arg)