tMerge pull request #1350 from CodingAnarchy/master - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit 652f0d0b7fc33f53679628ac73e9e43062e50319 DIR parent 89f9f4144542b5b905e57bce83dfd9a351db2019 HTML Author: ThomasV <electrumdev@gmail.com> Date: Tue, 7 Jul 2015 05:43:47 +0200 Merge pull request #1350 from CodingAnarchy/master Remove --portable flag dependency on not setting wallet path via command line Diffstat: M electrum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- DIR diff --git a/electrum b/electrum t@@ -388,7 +388,7 @@ if __name__ == '__main__': if config_options.get('server'): config_options['auto_connect'] = False - if config_options.get('portable') and config_options.get('wallet_path') is None: + if config_options.get('portable'): config_options['electrum_path'] = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum_data') # If private key is passed on the command line, '?' triggers prompt.