From bc4fe5e56a448259606ed5234b1d1ed958f5e2e2 Mon Sep 17 00:00:00 2001 From: "Michael R. Fisher" Date: Sun, 14 Jul 2013 21:06:25 -0500 Subject: [PATCH] Use a static string variable for dll path. Making this consistent with all other funtions in this file. --- libs/ardour/filesystem_paths.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc index 73bfaff137..bea0e330b9 100644 --- a/libs/ardour/filesystem_paths.cc +++ b/libs/ardour/filesystem_paths.cc @@ -86,11 +86,14 @@ user_config_directory () std::string ardour_dll_directory () { - std::string s = Glib::getenv("ARDOUR_DLL_PATH"); + static std::string s; + if (s.empty()) { - std::cerr << _("ARDOUR_DLL_PATH not set in environment - exiting\n"); - ::exit (1); - } + s = Glib::getenv("ARDOUR_DLL_PATH"); + std::cerr << _("ARDOUR_DLL_PATH not set in environment - exiting\n"); + ::exit (1); + } + return s; }