Merge branch 'stable'

cflavio · Apr 15, 2017 · 96bfc97 · 96bfc97
2 parents 6c1a214 + 72019bb
commit 96bfc97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/main.py b/main.py
@@ -13,11 +13,11 @@
         log_path = join(str(Filename.get_user_appdata_directory()), 'Yorg')
         if not exists(log_path):
             Filename.mkdir(Filename(log_path))
-    sys.stdout = open(join(log_path, 'yorg_output.txt'), 'w')
-    sys.stderr = open(join(log_path, 'yorg_error.txt'), 'w')
+    sys.stdout = open(join(log_path, 'yorg_output.txt') if log_path else 'yorg_output.txt', 'w')
+    sys.stderr = open(join(log_path, 'yorg_error.txt') if log_path else 'yorg_error.txt', 'w')
     nout = MultiplexStream()
     Notify.ptr().setOstreamPtr(nout, 0)
-    nout.addFile(join(log_path, 'yorg_log.txt'))
+    nout.addFile(join(log_path, 'yorg_log.txt') if log_path else 'yorg_log.txt')
 
 
 # main #######################################################################

diff --git a/yorg/yorg.py b/yorg/yorg.py
@@ -46,7 +46,7 @@ def __init__(self):
         opt_path = ''
         if platform == 'win32':
             opt_path = join(str(Filename.get_user_appdata_directory()), 'Yorg')
-        self.options = DictFile(join(opt_path, 'options.yml'), default_opt)
+        self.options = DictFile(join(opt_path, 'options.yml') if opt_path else 'options.yml', default_opt)
         conf = Configuration(
             win_title='Yorg',
             win_orig=self.options['development']['win_orig'],