Further-enforce lockordering by enforcing directly after TRY_LOCKs

src/sync.cpp

@@ -110,7 +110,6 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
 
     (*lockstack).push_back(std::make_pair(c, locklocation));
 
-    if (!fTry) {
     BOOST_FOREACH (const PAIRTYPE(void*, CLockLocation) & i, (*lockstack)) {
         if (i.first == c)
             break;
@@ -126,7 +125,6 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
             potential_deadlock_detected(p1, lockdata.lockorders[p2], lockdata.lockorders[p1]);
     }
 }
-}
 
 static void pop_lock()
 {