Merge pull request #1350 from CodingAnarchy/master

Remove --portable flag dependency on not setting wallet path via command line

electrum

@@ -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.