[LyX/master] Revert last two commits, which we pushed accidentally.

[Richard Kimberly Heck]

commit a20f3a0d52ab86e8345a5be4e73b69867e47093f
Author: Richard Kimberly Heck <rikih...@lyx.org>
Date:   Wed Sep 11 20:46:33 2019 -0400

    Revert last two commits, which we pushed accidentally.
---
 src/insets/InsetInclude.cpp |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 2c02002..2810515 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;