fix bugs;

tanZiWen · Oct 19, 2016 · ca7a211 · ca7a211
1 parent 0d1df4f
commit ca7a211
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/AntSharesUI/UI/ClaimForm.cs b/AntSharesUI/UI/ClaimForm.cs
@@ -39,6 +39,7 @@ private void button1_Click(object sender, EventArgs e)
                     }
                 }
             });
+            this.Close();
         }
     }
 }
diff --git a/AntSharesUI/UI/MainForm.cs b/AntSharesUI/UI/MainForm.cs
@@ -43,6 +43,7 @@ private void AddContractToListView(Contract contract, bool selected = false)
         private void Blockchain_PersistCompleted(object sender, Block block)
         {
             persistence_time = DateTime.Now;
+            CurrentWallet_TransactionsChanged(null, Enumerable.Empty<TransactionInfo>());
         }
 
         private void ChangeWallet(UserWallet wallet)
@@ -135,7 +136,9 @@ private void CurrentWallet_TransactionsChanged(object sender, IEnumerable<Transa
                 }
                 foreach (ListViewItem item in listView3.Items)
                 {
-                    item.SubItems["confirmations"].Text = (Blockchain.Default.Height - ((TransactionInfo)item.Tag).Height + 1)?.ToString() ?? Strings.Unconfirmed;
+                    int? confirmations = (int)Blockchain.Default.Height - (int)((TransactionInfo)item.Tag).Height + 1;
+                    if (confirmations <= 0) confirmations = null;
+                    item.SubItems["confirmations"].Text = confirmations?.ToString() ?? Strings.Unconfirmed;
                 }
             }
         }
@@ -166,6 +169,8 @@ private void timer1_Tick(object sender, EventArgs e)
                 toolStripProgressBar1.Value = persistence_span.Seconds;
                 toolStripProgressBar1.Style = ProgressBarStyle.Blocks;
             }
+            if (Program.CurrentWallet?.WalletHeight > Blockchain.Default.Height + 1)
+                return;
             if (balance_changed)
             {
                 IEnumerable<Coin> coins = Program.CurrentWallet?.FindCoins() ?? Enumerable.Empty<Coin>();
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,7 @@ private void button1_Click(object sender, EventArgs e) @@
                         }
                     }
                 });
+                this.Close();
             }
         }
     }