X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fbundle_env_mingw.cc;h=2cc298cafee66c0cbb3980f2998e1e62ff24b685;hb=04bbe402b030017476bc774af0e940bcd99f35b0;hp=2eb98f88a5b265f4d67a5fdfd3ee0402439a1a2b;hpb=3f7986198b1e30a5733f5d42a978deb738460fef;p=ardour.git

diff --git a/gtk2_ardour/bundle_env_mingw.cc b/gtk2_ardour/bundle_env_mingw.cc
index 2eb98f88a5..2cc298cafe 100644
--- a/gtk2_ardour/bundle_env_mingw.cc
+++ b/gtk2_ardour/bundle_env_mingw.cc
@@ -58,9 +58,9 @@ get_install_path ()
 		char tmp[PATH_MAX+1];
 		if (
 #ifdef __MINGW64__
-				(ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\Ardour\\ardour3\\w64", 0, KEY_READ, &key))
+				(ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\w64", 0, KEY_READ, &key))
 #else
-				(ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\Ardour\\ardour3\\w32", 0, KEY_READ, &key))
+				(ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\w32", 0, KEY_READ, &key))
 #endif
 				&&(ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
 			 )
@@ -105,7 +105,7 @@ fixup_bundle_environment (int, char* [], const char** localedir)
 	} else {
 		path = "";
 	}
-	path += Glib::build_filename(get_install_path(), "lib", "ardour3", "vamp");
+	path += Glib::build_filename(ardour_dll_directory(), "vamp");
 	path += G_SEARCHPATH_SEPARATOR;
 	path += "%ProgramFiles%\\Vamp Plugins"; // default vamp path
 	path += G_SEARCHPATH_SEPARATOR;