merge jsonrpc gui and daemon

2015-11-30 10:09:54 +01:00
parent e190024f73
commit 4682d95a76
4 changed files with 181 additions and 204 deletions
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -118,7 +118,9 @@ class WalletStorage(PrintError):
                self.write()

    def write(self):
-        assert not threading.currentThread().isDaemon()
+        if threading.currentThread().isDaemon():
+            self.print_error('warning: daemon thread cannot write wallet')
+            return
        if not self.modified:
            return
        s = json.dumps(self.data, indent=4, sort_keys=True)