From: Richard Kimberly Heck Date: Thu, 12 Sep 2019 00:46:33 +0000 (-0400) Subject: Revert last two commits, which we pushed accidentally. X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=88803b154d3091b3f7782e6f963236a495e814a5;p=features.git Revert last two commits, which we pushed accidentally. --- diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp index 2c02002589..281051541b 100755 --- a/src/insets/InsetInclude.cpp +++ b/src/insets/InsetInclude.cpp @@ -569,10 +569,11 @@ void InsetInclude::latex(otexstream & os, OutputParams const & runparams) const from_utf8(masterBuffer->filePath()))); } - string const exppath = runparams.export_folder.empty() ? - incfile : - makeAbsPath(exppath, runparams.export_folder).realPath(); - FileName(exppath).onlyPath().createPath(); + string exppath = incfile; + if (!runparams.export_folder.empty()) { + exppath = makeAbsPath(exppath, runparams.export_folder).realPath(); + FileName(exppath).onlyPath().createPath(); + } // write it to a file (so far the complete file) string exportfile;