From 104cafedb02186713b06a30c365f163f19024665 Mon Sep 17 00:00:00 2001
From: Jack <jack@robisonservice.com>
Date: Wed, 1 Jun 2016 20:52:15 -0400
Subject: [PATCH] --wallet fix

---
 lbrynet/lbrylive/LBRYStdoutDownloader.py    |  2 +-
 lbrynet/lbrynet_daemon/LBRYDaemon.py        | 10 ++++++++--
 lbrynet/lbrynet_daemon/LBRYDaemonControl.py |  2 +-
 lbrynet/lbrynet_daemon/LBRYDaemonServer.py  |  4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lbrynet/lbrylive/LBRYStdoutDownloader.py b/lbrynet/lbrylive/LBRYStdoutDownloader.py
index 0c1fe8c60..8c413e129 100644
--- a/lbrynet/lbrylive/LBRYStdoutDownloader.py
+++ b/lbrynet/lbrylive/LBRYStdoutDownloader.py
@@ -1,7 +1,7 @@
 import logging
 import sys
 
-from lbrynet.lbrynet_console.plugins.LBRYLive.LBRYLiveStreamDownloader import LBRYLiveStreamDownloader
+from lbrynet.lbrylive.client.LiveStreamDownloader import LBRYLiveStreamDownloader
 from lbrynet.core.BlobManager import TempBlobManager
 from lbrynet.core.Session import LBRYSession
 from lbrynet.core.client.StandaloneBlobDownloader import StandaloneBlobDownloader
diff --git a/lbrynet/lbrynet_daemon/LBRYDaemon.py b/lbrynet/lbrynet_daemon/LBRYDaemon.py
index 5f5e3fbec..2625b5709 100644
--- a/lbrynet/lbrynet_daemon/LBRYDaemon.py
+++ b/lbrynet/lbrynet_daemon/LBRYDaemon.py
@@ -131,7 +131,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
 
     isLeaf = True
 
-    def __init__(self, root, wallet_type=DEFAULT_WALLET):
+    def __init__(self, root, wallet_type=None):
         jsonrpc.JSONRPC.__init__(self)
         reactor.addSystemEventTrigger('before', 'shutdown', self._shutdown)
 
@@ -250,7 +250,13 @@ class LBRYDaemon(jsonrpc.JSONRPC):
         self.search_timeout = self.session_settings['search_timeout']
         self.download_timeout = self.session_settings['download_timeout']
         self.max_search_results = self.session_settings['max_search_results']
-        self.wallet_type = self.session_settings['wallet_type'] if self.session_settings['wallet_type'] in WALLET_TYPES else wallet_type
+        if self.session_settings['wallet_type'] in WALLET_TYPES and not wallet_type:
+            self.wallet_type = self.session_settings['wallet_type']
+            log.info("Using wallet type %s from config" % self.wallet_type)
+        else:
+            self.wallet_type = wallet_type
+            self.session_settings['wallet_type'] = wallet_type
+            log.info("Using wallet type %s specified from command line" % self.wallet_type)
         self.delete_blobs_on_remove = self.session_settings['delete_blobs_on_remove']
         self.peer_port = self.session_settings['peer_port']
         self.dht_node_port = self.session_settings['dht_node_port']
diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonControl.py b/lbrynet/lbrynet_daemon/LBRYDaemonControl.py
index 72c8d2c1e..e441ca923 100644
--- a/lbrynet/lbrynet_daemon/LBRYDaemonControl.py
+++ b/lbrynet/lbrynet_daemon/LBRYDaemonControl.py
@@ -64,7 +64,7 @@ def start():
     parser.add_argument("--wallet",
                         help="lbrycrd or lbryum, default lbryum",
                         type=str,
-                        default=DEFAULT_WALLET)
+                        default='')
     parser.add_argument("--ui",
                         help="path to custom UI folder",
                         default=None)
diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py
index 393a87b72..aa5b70b11 100644
--- a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py
+++ b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py
@@ -198,7 +198,7 @@ class LBRYDaemonServer(object):
         self.root.putChild(API_ADDRESS, self._api)
         return defer.succeed(True)
 
-    def start(self, branch=DEFAULT_UI_BRANCH, user_specified=False, branch_specified=False, wallet=DEFAULT_WALLET):
-        d = self._setup_server(self._setup_server(wallet))
+    def start(self, branch=DEFAULT_UI_BRANCH, user_specified=False, branch_specified=False, wallet=None):
+        d = self._setup_server(wallet)
         d.addCallback(lambda _: self._api.setup(branch, user_specified, branch_specified))
         return d