From 73822e8ec250ed99ec34a88c450fcd98c8fe5d1d Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Wed, 24 Feb 2016 16:57:58 +0100
Subject: [PATCH] fix: pass cwd with config_options

---
 electrum             | 3 ++-
 lib/simple_config.py | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/electrum b/electrum
index 817d12c19..75aeb53c2 100755
--- a/electrum
+++ b/electrum
@@ -286,7 +286,6 @@ if __name__ == '__main__':
             'verbose': True,
             'cmd': 'gui',
             'gui': 'kivy',
-            #'auto_connect': True,
         }
     else:
         config_options = args.__dict__
@@ -296,6 +295,8 @@ if __name__ == '__main__':
         if config_options.get('server'):
             config_options['auto_connect'] = False
 
+    config_options['cwd'] = os.getcwd()
+
     if config_options.get('portable'):
         config_options['electrum_path'] = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum_data')
 
diff --git a/lib/simple_config.py b/lib/simple_config.py
index b887a739e..fc40a5899 100644
--- a/lib/simple_config.py
+++ b/lib/simple_config.py
@@ -139,9 +139,8 @@ class SimpleConfig(PrintError):
         """Set the path of the wallet."""
 
         # command line -w option
-        path = self.get('wallet_path')
-        if path:
-            return path
+        if self.get('wallet_path'):
+            return os.path.join(self.get('cwd'), self.get('wallet_path'))
 
         # path in config file
         path = self.get('default_wallet_path')