From ed9bc882b7e54055e5793d78c610fe214c016fc3 Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Tue, 1 Sep 2020 11:33:18 +0200
Subject: [PATCH] minor ui fix, safe unsubscribe

---
 .../java/com/sparrowwallet/sparrow/control/EntryCell.java   | 1 +
 .../com/sparrowwallet/sparrow/wallet/TransactionEntry.java  | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java b/src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java
index e6f80e6c..0f2f0ea7 100644
--- a/src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java
+++ b/src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java
@@ -228,6 +228,7 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
         cell.getStyleClass().remove("utxo-row");
         cell.getStyleClass().remove("address-cell");
         cell.getStyleClass().remove("hashindex-row");
+        cell.getStyleClass().remove("confirming");
         cell.getStyleClass().remove("spent");
         cell.getStyleClass().remove("unspendable");
 
diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/TransactionEntry.java b/src/main/java/com/sparrowwallet/sparrow/wallet/TransactionEntry.java
index bf903ea4..aa69d85f 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/TransactionEntry.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/TransactionEntry.java
@@ -211,7 +211,11 @@ public class TransactionEntry extends Entry implements Comparable<TransactionEnt
     public void walletTabsClosed(WalletTabsClosedEvent event) {
         for(WalletTabData tabData : event.getClosedWalletTabData()) {
             if(tabData.getWalletForm().getWallet() == wallet) {
-                EventManager.get().unregister(this);
+                try {
+                    EventManager.get().unregister(this);
+                } catch(IllegalArgumentException e) {
+                    //Safe to ignore
+                }
             }
         }
     }