also search for 32bit xjadeo on 64bit windows
authorRobin Gareus <robin@gareus.org>
Mon, 24 Nov 2014 00:43:31 +0000 (01:43 +0100)
committerRobin Gareus <robin@gareus.org>
Mon, 24 Nov 2014 00:43:31 +0000 (01:43 +0100)
gtk2_ardour/video_timeline.cc

index 5ba6c2b9ac1148d792fb8781231468a2dceeb529..0eeed4a29a8e66916f8c570fe11f43817988b0ef 100644 (file)
@@ -754,6 +754,12 @@ VideoTimeLine::find_xjadeo () {
        {
                _xjadeo_bin = std::string(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "xjadeo.exe", 0));
        }
+       else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSS\\xjadeo", 0, KEY_READ | KEY_WOW64_32KEY, &key))
+                       &&  (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
+                       )
+       {
+               _xjadeo_bin = std::string(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "xjadeo.exe", 0));
+       }
        else if (program_files && Glib::file_test(g_build_filename(program_files, "xjadeo", "xjadeo.exe", 0), Glib::FILE_TEST_EXISTS))
        {
                _xjadeo_bin = std::string(g_build_filename(program_files, "xjadeo", "xjadeo.exe", 0));