Merge pull request #12 from uhlik-exosis-development/master

masternode and url fixes
exosiscrypto · May 9, 2019 · 3105602 · 3105602
2 parents 326db47 + fdc9092
commit 3105602
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -572,7 +572,7 @@ void SetupServerArgs()
 std::string LicenseInfo()
 {
     const std::string URL_SOURCE_CODE = "<https://github.com/exosis/exosis>";
-    const std::string URL_WEBSITE = "<https://fixedtradecoin.org>";
+    const std::string URL_WEBSITE = "<https://exosis.org>";
 
     return CopyrightHolders(strprintf(_("Copyright (C) %i-%i"), 2009, COPYRIGHT_YEAR) + " ") + "\n" +
            "\n" +

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
@@ -151,7 +151,10 @@ bool CMasternodeMan::PoSeBan(const COutPoint &outpoint)
 
 void CMasternodeMan::Check()
 {
-    LOCK(cs);
+    // FXTC BEGIN
+    //LOCK(cs);
+    LOCK2(cs_main, cs);
+    // FXTC END
 
     LogPrint(BCLog::MASTERNODE, "CMasternodeMan::Check -- nLastWatchdogVoteTime=%d, IsWatchdogActive()=%d\n", nLastWatchdogVoteTime, IsWatchdogActive());
 
@@ -1452,7 +1455,10 @@ bool CMasternodeMan::CheckMnbAndUpdateMasternodeList(CNode* pfrom, CMasternodeBr
 
 void CMasternodeMan::UpdateLastPaid(const CBlockIndex* pindex)
 {
-    LOCK(cs);
+    // FXTC BEGIN
+    //LOCK(cs);
+    LOCK2(cs_main, cs);
+    // FXTC END
 
     if(fLiteMode || !masternodeSync.IsWinnersListSynced() || mapMasternodes.empty()) return;
 
@@ -1510,7 +1516,10 @@ void CMasternodeMan::RemoveGovernanceObject(uint256 nGovernanceObjectHash)
 
 void CMasternodeMan::CheckMasternode(const CPubKey& pubKeyMasternode, bool fForce)
 {
-    LOCK(cs);
+    // FXTC BEGIN
+    //LOCK(cs)
+    LOCK2(cs_main, cs);
+    // FXTC END
     for (auto& mnpair : mapMasternodes) {
         if (mnpair.second.pubKeyMasternode == pubKeyMasternode) {
             mnpair.second.Check(fForce);