Merge branch 'release-0.3.1'0.3.1

2 files changed, 6 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index bc9c679..65abb84 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+0.3.1 Nov 1:
+  o Support user provided logfile option and default to bitmask.log
+    otherwise. Fixes #4153.
+
 0.3.0 Aug 23:
   o Use bitmask.log instead of leap_client.log. Closes #3424.
   o Update launcher icon, jumping guy -> rainbow mask.
diff --git a/src/main.cpp b/src/main.cpp
index d84b15a..e528289 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -163,7 +163,8 @@ main(int argc, char** argv)
       "import encodings.idna\n" // we need to make sure this is imported
       "sys.argv.append('--standalone')\n"
       "sys.argv.append('--debug')\n"
-      "sys.argv.append('--logfile=bitmask.log')\n", global, global);
+      "if any(map(lambda x: x.startswith('--logfile') or x.startswith('-l'), sys.argv))\n"
+      "    sys.argv.append('--logfile=bitmask.log')\n", global, global);
 
     py::exec_file("apps/launcher.py",
                   global,