QT hanging fix

levonpetrosyan93 · levonpetrosyan93 · commit 7ec3281416e1 · 2024-10-18T04:11:26.000+04:00
diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
@@ -165,7 +165,9 @@ void MasternodeList::updateDIP3List()
     {
         // Get all UTXOs for each MN collateral in one go so that we can reduce locking overhead for cs_main
         // We also do this outside of the below Qt list update loop to reduce cs_main locking time to a minimum
-        LOCK(cs_main);
+        TRY_LOCK(cs_main,lock_main);
+        if (!lock_main)
+            return;
         mnList.ForEachMN(false, [&](const CDeterministicMNCPtr& dmn) {
             CTxDestination collateralDest;
             Coin coin;
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
@@ -72,7 +72,12 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, TransactionReco
 {
     QString strHTML;
 
-    LOCK2(cs_main, wallet->cs_wallet);
+    TRY_LOCK(cs_main,lock_main);
+    if (!lock_main)
+        return strHTML;
+    TRY_LOCK(wallet->cs_wallet,lock_wallet);
+    if (!lock_wallet)
+        return strHTML;
     strHTML.reserve(4000);
     strHTML += "<html><font face='verdana, arial, helvetica, sans-serif'>";
 
