fix error-level

[ardour.git] / libs / ardour / filesystem_paths.cc

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index fe1afd85d82b1a73e5fc1b11346d3e7857930b20..daa762fa8aae456ec299559f0b445169625f81ad 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -122,9 +122,9 @@ user_config_directory (int version)
                                exit (1);
                        }
                        } else if (!Glib::file_test (p, Glib::FILE_TEST_IS_DIR)) {
-                       error << string_compose (_("Configuration directory %1 already exists and is not a directory/folder - cannot run"),
+                       fatal << string_compose (_("Configuration directory %1 already exists and is not a directory/folder - cannot run"),
                                                 p) << endmsg;
-                       exit (1);
+                       abort(); /*NOTREACHED*/
                }
        }
 
@@ -190,7 +190,7 @@ user_cache_directory ()
        } else if (!Glib::file_test (p, Glib::FILE_TEST_IS_DIR)) {
                fatal << string_compose (_("Cache directory %1 already exists and is not a directory/folder - cannot run"),
                                           p) << endmsg;
-               exit (1);
+               abort(); /*NOTREACHED*/
        }
 
        return p;
@@ -200,7 +200,7 @@ std::string
 ardour_dll_directory ()
 {
 #ifdef PLATFORM_WINDOWS
-       std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL));
+       std::string dll_dir_path(windows_package_directory_path());
        dll_dir_path = Glib::build_filename (dll_dir_path, "lib");
        return Glib::build_filename (dll_dir_path, LIBARDOUR);
 #else
@@ -217,10 +217,27 @@ ardour_dll_directory ()
 Searchpath
 windows_search_path ()
 {
-       std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL));
+       std::string dll_dir_path(windows_package_directory_path());
        dll_dir_path = Glib::build_filename (dll_dir_path, "share");
        return Glib::build_filename (dll_dir_path, LIBARDOUR);
 }
+
+std::string
+windows_package_directory_path ()
+{
+       char* package_dir =
+           g_win32_get_package_installation_directory_of_module (NULL);
+
+       if (package_dir == NULL) {
+               fatal << string_compose (_("Cannot determine %1 package directory"),
+                                          PROGRAM_NAME) << endmsg;
+               abort(); /*NOTREACHED*/
+       }
+
+       std::string package_dir_path(package_dir);
+       g_free(package_dir);
+       return package_dir_path;
+}
 #endif
 
 Searchpath