Maybe fix for OSX Travis build?

christopherpow · Mar 14, 2021 · 9d0845c · 9d0845c
1 parent 5b05f98
commit 9d0845c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/build/clean.sh b/build/clean.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 function really_clean() {
-  for f in apps/{ide,fami*,nes*} libs/{nes,c64,fami*} deps/{rtmidi,qscintilla2/Qt4Qt5}; do echo $f; ( rm -rfv $f/debug $f/release $f/Makefile* $f/.qmake* ); done
+  for f in apps/{ide,fami*,nes*} libs/{nes,c64,fami*} deps/{rtmidi,qhexedit2/src,qscintilla2/Qt4Qt5}; do echo $f; ( rm -rfv $f/debug $f/release $f/Makefile* $f/.qmake* ); done
 }
 
 echo Cleaning NESICIDE...

diff --git a/common/cqtmfc.cpp b/common/cqtmfc.cpp
@@ -13,6 +13,7 @@
 #include <QPaintEngine>
 #include <QProcess>
 #include <QWaitCondition>
+#include <QPainterPath>
 
 #include "cqtmfc.h"
 #include "resource.h"
@@ -15196,6 +15197,7 @@ HGLOBAL COleDataObject::GetGlobalData(
    return (HGLOBAL)GetClipboardData(cfFormat);
 }
 
+QSemaphore* waitingSem = NULL;
 DWORD WINAPI WaitForSingleObject(
    HANDLE hHandle,
    DWORD dwMilliseconds
@@ -15205,7 +15207,6 @@ DWORD WINAPI WaitForSingleObject(
    CCmdTarget* pCmdTarget = dynamic_cast<CCmdTarget*>(pObject);
    CWinThread* pWinThread = dynamic_cast<CWinThread*>(pCmdTarget);
    CEvent* pEvent = dynamic_cast<CEvent*>(pObject);
-   static QSemaphore* waitingSem = NULL;
    bool timedOut;
 
    if ( pWinThread && pWinThread->IsKindOf(RUNTIME_CLASS(CWinThread)) )
@@ -15358,8 +15359,8 @@ BOOL CEvent::PulseEvent()
    foreach ( QSemaphore* waiter, _waiters )
    {
       waiter->release();
-      _waiters.removeAll(waiter);
    }
+   _waiters.clear();
    _access.unlock();
    _access.lock();
    m_bSignalled = false;