liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix startup crash in debug build

Browse Source 
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 dab9a3f57e
commit 17b9e7c107
No known key found for this signature in database
GPG Key ID: 048FF2B76A63895F
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtgui/threadutils.cc
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 ()

8
rtgui/threadutils.h
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;