GuiTabular.cpp: don't hardcode decimal align combobox item

[lyx.git] / src / graphics / GraphicsConverter.cpp

diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
index e3386f13ead0455f5b7d3911f8daf9b8909e8803..ccfb57ce4b4a02f9dfa3a1507713de677856987c 100644 (file)
--- a/src/graphics/GraphicsConverter.cpp
+++ b/src/graphics/GraphicsConverter.cpp
@@ -356,6 +356,12 @@ static void build_script(string const & from_file,
                                  subst(conv.result_file,
                                        token_base, onlyFileName(infile_base)));
 
+               // If two formats share the same extension we may get identical names
+               if (outfile == infile && conv.result_file.empty()) {
+                       string const new_base = FileName::tempName(tmp).toFilesystemEncoding();
+                       outfile = addExtension(new_base, conv.To->extension());
+               }
+
                // Store these names in the python script
                script << "infile = "
                                << quoteName(infile, quote_python) << "\n"