2 files changed, 14 insertions, 4 deletions
diff --git a/gnuradio-runtime/lib/prefs.cc b/gnuradio-runtime/lib/prefs.cc
index 4173973c2e..777d64211f 100644
--- a/gnuradio-runtime/lib/prefs.cc
+++ b/gnuradio-runtime/lib/prefs.cc
@@ -102,8 +102,7 @@ void prefs::_read_files(const std::vector<std::string>& filenames)
                         section = "default";
                         key = okey;
                     }
-                    std::transform(
-                        section.begin(), section.end(), section.begin(), ::tolower);
+                    std::transform(section.begin(), section.end(), section.begin(), ::tolower);
                     std::transform(key.begin(), key.end(), key.begin(), ::tolower);
                     // value of a basic_option is always a std::vector<string>; we only
                     // allow single values, so:
diff --git a/gnuradio-runtime/lib/sys_paths.cc b/gnuradio-runtime/lib/sys_paths.cc
index 6305bb40bc..2f26724e7c 100644
--- a/gnuradio-runtime/lib/sys_paths.cc
+++ b/gnuradio-runtime/lib/sys_paths.cc
@@ -66,8 +66,19 @@ const char* appdata_path()
 
 std::string __userconf_path()
 {
-    boost::filesystem::path p(appdata_path());
-    p = p / ".gnuradio";
+    const char* path;
+
+    // First determine if there is an environment variable specifying the prefs path
+    path = getenv("GR_PREFS_PATH");
+    boost::filesystem::path p;
+    if (path) {
+        p = path;
+    }
+    else {
+        p = appdata_path();
+        p = p / ".gnuradio";
+    }
+   
     return p.string();
 }