X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.C;h=200e0a5a0714d68799a82ee226e8e019234e18d6;hb=104051c151f7c3b37ca4febdb2bc3878f0d6a9b5;hp=7c4ad3c3d0d9cd813290218d4e117dd65bc5b279;hpb=33ca420a4a1fdbad68235e519341229bb01b54c0;p=lyx.git

diff --git a/src/converter.C b/src/converter.C
index 7c4ad3c3d0..200e0a5a07 100644
--- a/src/converter.C
+++ b/src/converter.C
@@ -451,7 +451,7 @@ bool Converters::convert(Buffer const * buffer,
 					" < " + quoteName(infile2 + ".out") +
 					" > " + quoteName(logfile);
 				one.startscript(Systemcall::Wait, command2);
-				if (!scanLog(*buffer, command, FileName(makeAbsPath(logfile, path)), errorList))
+				if (!scanLog(*buffer, command, makeAbsPath(logfile, path), errorList))
 					return false;
 			}
 
@@ -512,30 +512,33 @@ bool Converters::move(string const & fmt,
 	string const to_base = removeExtension(to.absFilename());
 	string const to_extension = getExtension(to.absFilename());
 
-	vector<string> const files = dirList(FileName(path),
+	vector<FileName> const files = dirList(FileName(path),
 			getExtension(from.absFilename()));
-	for (vector<string>::const_iterator it = files.begin();
-	     it != files.end(); ++it)
-		if (prefixIs(*it, base)) {
-			string const from2 = path + *it;
-			string to2 = to_base + it->substr(base.length());
-			to2 = changeExtension(to2, to_extension);
+	for (vector<FileName>::const_iterator it = files.begin();
+	     it != files.end(); ++it) {
+		string const from2 = it->absFilename();
+		string const file2 = onlyFilename(from2);
+		if (prefixIs(file2, base)) {
+			string const to2 = changeExtension(
+				to_base + file2.substr(base.length()),
+				to_extension);
 			lyxerr[Debug::FILES] << "moving " << from2
 					     << " to " << to2 << endl;
 
 			Mover const & mover = movers(fmt);
 			bool const moved = copy
-				? mover.copy(FileName(from2), FileName(to2))
-				: mover.rename(FileName(from2), FileName(to2));
+				? mover.copy(*it, FileName(to2))
+				: mover.rename(*it, FileName(to2));
 			if (!moved && no_errors) {
 				Alert::error(_("Cannot convert file"),
 					bformat(copy ?
 						_("Could not copy a temporary file from %1$s to %2$s.") :
 						_("Could not move a temporary file from %1$s to %2$s."),
-						from_ascii(from2), from_ascii(to2)));
+						from_utf8(from2), from_utf8(to2)));
 				no_errors = false;
 			}
 		}
+	}
 	return no_errors;
 }