From e9523f231ba4e14d0e04a530936a92359d7b3343 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Mon, 17 Aug 2015 12:49:04 +0200
Subject: [PATCH] fix account renaming issues #1158 #1299

---
 gui/qt/main_window.py | 2 +-
 gui/qt/util.py        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index b60e8f29..9cca30ce 100644
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -1706,9 +1706,9 @@ class ElectrumWindow(QMainWindow):
                 name = self.wallet.get_account_name(k)
                 c, u, x = self.wallet.get_account_balance(k)
                 account_item = QTreeWidgetItem([ name, '', self.format_amount(c + u + x), ''])
-                l.addTopLevelItem(account_item)
                 account_item.setExpanded(self.accounts_expanded.get(k, True))
                 account_item.setData(0, Qt.UserRole, k)
+                l.addTopLevelItem(account_item)
             else:
                 account_item = l
             sequences = [0,1] if account.has_change() else [0]
diff --git a/gui/qt/util.py b/gui/qt/util.py
index cb78c41d..bd2e8863 100644
--- a/gui/qt/util.py
+++ b/gui/qt/util.py
@@ -335,6 +335,8 @@ class MyTreeWidget(QTreeWidget):
             self.is_edit = False
 
     def label_changed(self, item, column):
+        if column != self.edit_column:
+            return
         if self.is_edit:
             return
         self.is_edit = True