Fix startup crash in debug build

Do not throw error when trying to get mutex lock.
This commit is contained in:
Lawrence Lee
2023-09-09 15:22:04 -07:00
parent 97e181bd58
commit 730704f3b2
2 changed files with 10 additions and 5 deletions

View File

@@ -29,9 +29,13 @@
MyMutex::MyMutex() : locked(false) {} MyMutex::MyMutex() : locked(false) {}
void MyMutex::checkLock () bool MyMutex::checkLock (bool noError)
{ {
if (locked) { if (locked) {
if (noError) {
return false;
}
std::cerr << "MyMutex already locked!" << std::endl; std::cerr << "MyMutex already locked!" << std::endl;
#ifdef _WIN32 #ifdef _WIN32
@@ -42,6 +46,7 @@ void MyMutex::checkLock ()
} }
locked = true; locked = true;
return true;
} }
void MyMutex::checkUnlock () void MyMutex::checkUnlock ()

View File

@@ -59,7 +59,7 @@ public:
private: private:
bool locked; bool locked;
void checkLock (); bool checkLock (bool noError=false);
void checkUnlock (); void checkUnlock ();
#endif #endif
}; };
@@ -172,10 +172,10 @@ inline bool MyMutex::trylock ()
{ {
if (MyMutexBase::try_lock ()) { if (MyMutexBase::try_lock ()) {
#if STRICT_MUTEX && !NDEBUG #if STRICT_MUTEX && !NDEBUG
checkLock (); return checkLock(true);
#endif #else
return true; return true;
#endif
} }
return false; return false;