fix crash when copy'ing latent plugins

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

diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc
index 7e9b4e18577f263e1b9b7c11400834fc3cee0863..47b9994cc6c9229e6090e0f5128d98d50872e455 100644 (file)
--- a/libs/ardour/filesystem_paths.cc
+++ b/libs/ardour/filesystem_paths.cc
@@ -29,7 +29,7 @@
 #include "ardour/directory_names.h"
 #include "ardour/filesystem_paths.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef PLATFORM_WINDOWS
 #include "shlobj.h"
@@ -50,17 +50,17 @@ user_config_directory_name (int version = -1)
        }
 
        /* ARDOUR::Profile may not be available when this is
-          called, so rely on build-time detection of the 
+          called, so rely on build-time detection of the
           product name etc.
        */
-       
+
 #ifdef USE_TRACKS_CODE_FEATURES
        /* Tracks does not use versioned configuration folders, which may or
           may not be problematic in the future.
        */
        return X_(PROGRAM_NAME);
 
-#else          
+#else
        const string config_dir_name = string_compose ("%1%2", X_(PROGRAM_NAME), version);
 
 #if defined (__APPLE__) || defined (PLATFORM_WINDOWS)
@@ -70,8 +70,8 @@ user_config_directory_name (int version = -1)
        /* use lower case folder name on Linux */
        return downcase (config_dir_name);
 #endif
-#endif 
-}      
+#endif
+}
 
 std::string
 user_config_directory (int version)
@@ -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;
@@ -208,7 +208,7 @@ ardour_dll_directory ()
        if (s.empty()) {
                std::cerr << _("ARDOUR_DLL_PATH not set in environment - exiting\n");
                ::exit (1);
-       }       
+       }
        return s;
 #endif
 }
@@ -231,7 +231,7 @@ windows_package_directory_path ()
        if (package_dir == NULL) {
                fatal << string_compose (_("Cannot determine %1 package directory"),
                                           PROGRAM_NAME) << endmsg;
-               // not reached
+               abort(); /*NOTREACHED*/
        }
 
        std::string package_dir_path(package_dir);