From f302c9064991bc44ae8ce1a0f790f550ded196e3 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Tue, 17 Feb 2015 11:39:06 +0100
Subject: [PATCH] set self.wallet to None in plugin constructor

---
 lib/plugins.py           | 1 +
 plugins/exchange_rate.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/plugins.py b/lib/plugins.py
index 9a1b3b9f8..cb8600193 100644
--- a/lib/plugins.py
+++ b/lib/plugins.py
@@ -71,6 +71,7 @@ class BasePlugin:
     def __init__(self, config, name):
         self.name = name
         self.config = config
+        self.wallet = None
         # add self to hooks
         for k in dir(self):
             if k in hook_names:
diff --git a/plugins/exchange_rate.py b/plugins/exchange_rate.py
index d2e6a133b..1afdd4654 100644
--- a/plugins/exchange_rate.py
+++ b/plugins/exchange_rate.py
@@ -495,7 +495,6 @@ class Plugin(BasePlugin):
 
     @hook
     def load_wallet(self, wallet):
-        self.wallet = wallet
         tx_list = {}
         for item in self.wallet.get_tx_history(self.wallet.storage.get("current_account", None)):
             tx_hash, conf, is_mine, value, fee, balance, timestamp = item
@@ -555,6 +554,8 @@ class Plugin(BasePlugin):
             return
         if not self.resp_hist:
             return
+        if not self.wallet:
+            return
 
         self.win.is_edit = True
         self.win.history_list.setColumnCount(6)