UI: Add locks (thanks @dexX7)

zathras-crypto · zathras-crypto · commit 0c7708a2f272 · 2015-06-16T14:31:26.000+10:00
diff --git a/src/omnicore/omnicore.cpp b/src/omnicore/omnicore.cpp
@@ -95,15 +95,13 @@ using std::vector;
 
 using namespace mastercore;
 
-
-// comment out MY_HACK & others here - used for Unit Testing only !
-// #define MY_HACK
+CCriticalSection cs_tally;
 
 static string exodus_address = "1EXoDusjGwvnjZUyKkxZ4UHEf77z6A5S4P";
 static const string exodus_testnet = "mpexoDuSkGGqvqrkrjiFng38QPkJQVFyqv";
 static const string getmoney_testnet = "moneyqMan7uh8FqdCA2BV5yZ8qVrc9ikLP";
 
-static int nWaterlineBlock = 0;  //
+static int nWaterlineBlock = 0;
 
 //! Available balances of wallet properties
 std::map<uint32_t, int64_t> global_balance_money;
@@ -280,8 +278,6 @@ std::string FormatMP(unsigned int property, int64_t n, bool fSign)
 
 string const CMPSPInfo::watermarkKey("watermark");
 
-CCriticalSection cs_tally;
-
 OfferMap mastercore::my_offers;
 AcceptMap mastercore::my_accepts;
 
diff --git a/src/qt/balancesdialog.cpp b/src/qt/balancesdialog.cpp
@@ -133,6 +133,8 @@ void BalancesDialog::UpdatePropSelector()
     // don't waste time updating if there are no new properties
     if ((uint32_t)ui->propSelectorWidget->count() > global_wallet_property_list.size()) return;
 
+    LOCK(cs_tally);
+
     // a new property has been added to the wallet, update the property selector
     QString spId = ui->propSelectorWidget->itemData(ui->propSelectorWidget->currentIndex()).toString();
     ui->propSelectorWidget->clear();
@@ -171,6 +173,8 @@ void BalancesDialog::AddRow(const std::string& label, const std::string& address
 void BalancesDialog::PopulateBalances(unsigned int propertyId)
 {
     ui->balancesTable->setRowCount(0); // fresh slate (note this will automatically cleanup all existing QWidgetItems in the table)
+
+    LOCK(cs_tally);
     //are we summary?
     if(propertyId==2147483646) {
         ui->balancesTable->setHorizontalHeaderItem(0, new QTableWidgetItem("Property ID"));
@@ -188,7 +192,6 @@ void BalancesDialog::PopulateBalances(unsigned int propertyId)
     } else {
         ui->balancesTable->setHorizontalHeaderItem(0, new QTableWidgetItem("Label"));
         ui->balancesTable->setHorizontalHeaderItem(1, new QTableWidgetItem("Address"));
-        LOCK(cs_tally);
         bool propertyIsDivisible = isPropertyDivisible(propertyId); // only fetch the SP once, not for every address
 
         // iterate mp_tally_map looking for addresses that hold a balance in propertyId
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
@@ -288,6 +288,8 @@ void OverviewPage::updateOmni()
     // alert status when we're notified of an Omni state change
     updateAlerts();
 
+    LOCK(cs_tally);
+
     // always show MSC
     UpdatePropertyBalance(1,global_balance_money[1],global_balance_reserved[1]);
     // loop properties and update overview
diff --git a/src/qt/sendmpdialog.cpp b/src/qt/sendmpdialog.cpp
@@ -94,6 +94,9 @@ void SendMPDialog::updatePropSelector()
     uint32_t nextPropIdTestEco = GetNextPropertyId(false); // property ID rather than a fixed value like 100000 (optimization)
     QString spId = ui->propertyComboBox->itemData(ui->propertyComboBox->currentIndex()).toString();
     ui->propertyComboBox->clear();
+
+    LOCK(cs_tally);
+
     for (unsigned int propertyId = 1; propertyId < nextPropIdMainEco; propertyId++) {
         if ((global_balance_money[propertyId] > 0) || (global_balance_reserved[propertyId] > 0)) {
             std::string spName = getPropertyName(propertyId);
