X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross_windows.cc;h=2072ffd4c63ab47ed8cb3fb81e4bccf790eeb64d;hb=a1d3a73736ff2a171ab1160dedf4faea40454bea;hp=498078785972b945d3de755393250e2c132aa3d1;hpb=e3c78ffdb5e562841e86e6f59a20494159c44de7;p=dcpomatic.git

diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc
index 498078785..2072ffd4c 100644
--- a/src/lib/cross_windows.cc
+++ b/src/lib/cross_windows.cc
@@ -128,7 +128,6 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out)
 
 	wchar_t dir[512];
 	MultiByteToWideChar (CP_UTF8, 0, directory_containing_executable().string().c_str(), -1, dir, sizeof(dir));
-	SetCurrentDirectory (dir);
 
 	STARTUPINFO startup_info;
 	ZeroMemory (&startup_info, sizeof (startup_info));
@@ -147,7 +146,7 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out)
 
 	PROCESS_INFORMATION process_info;
 	ZeroMemory (&process_info, sizeof (process_info));
-	if (!CreateProcess (0, command, 0, 0, TRUE, CREATE_NO_WINDOW, 0, 0, &startup_info, &process_info)) {
+	if (!CreateProcess (0, command, 0, 0, TRUE, CREATE_NO_WINDOW, 0, dir, &startup_info, &process_info)) {
 		LOG_ERROR_NC (N_("ffprobe call failed (could not CreateProcess)"));
 		return;
 	}
@@ -206,6 +205,13 @@ xsd_path ()
 }
 
 
+boost::filesystem::path
+tags_path ()
+{
+	return directory_containing_executable().parent_path() / "tags";
+}
+
+
 boost::filesystem::path
 openssl_path ()
 {