client: fix logger init mix-up

2 files changed, 10 insertions, 4 deletions

diff --git a/client/application.cpp b/client/application.cpp
index a0e34360..839885d8 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -1971,12 +1971,12 @@ void Application::init_logger()
 #ifdef RED_DEBUG
     root.setPriority(log4cpp::Priority::DEBUG);
     root.removeAllAppenders();
-    ::close(fd);
-    root.addAppender(new log4cpp::RollingFileAppender("_", log_file_name));
+    root.addAppender(new log4cpp::FileAppender("_", fd));
 #else
     root.setPriority(log4cpp::Priority::INFO);
     root.removeAllAppenders();
-    root.addAppender(new log4cpp::FileAppender("_", fd));
+    ::close(fd);
+    root.addAppender(new log4cpp::RollingFileAppender("_", log_file_name));
 #endif
 }
 
diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp
index df689c03..02250f11 100644
--- a/client/x11/platform.cpp
+++ b/client/x11/platform.cpp
@@ -1915,11 +1915,17 @@ void Platform::get_app_data_dir(std::string& path, const std::string& app_name)
 {
     const char* home_dir = getenv("HOME");
 
-    if (!home_dir) {
+    if (!home_dir || strlen(home_dir) == 0) {
         throw Exception("get home dir failed");
     }
 
     path = home_dir;
+    std::string::iterator end = path.end();
+
+    while (end != path.begin() && *(end - 1) == '/') {
+        path.erase(--end);
+    }
+
     path += "/.";
     path += app_name;