1 files changed, 4 insertions, 7 deletions

diff --git a/src/main.cc b/src/main.cc
index 0639e30..435e9f4 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -239,13 +239,10 @@ struct Options {
         if (env && strlen(env) > 0) {
             session_display.assign(env);
         }
-#ifdef _WIN32
-        env = getenv("USERPROFILE");
-#else
-        env = getenv("HOME");
-#endif
-        if (env && strlen(env) > 0) {
-            rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox"));
+
+        rc_path = FbTk::StringUtil::expandFilename(std::string("~/.") + realProgramName("fluxbox"));
+
+        if (!rc_path.empty()) {
             rc_file = rc_path + "/init";
         }
     }