# HG changeset patch # User Chris Cannam # Date 1243941040 0 # Node ID f6fb85073d64c78e23e9f0b65381a253fccb823e # Parent 1c9258dd155e19926e0fa9102bb5b316a5940df9 * Condition fix (caused hang) diff -r 1c9258dd155e -r f6fb85073d64 qm-dsp.pro --- a/qm-dsp.pro Tue Jun 02 09:53:01 2009 +0000 +++ b/qm-dsp.pro Tue Jun 02 11:10:40 2009 +0000 @@ -17,7 +17,7 @@ win32-x-g++ { QMAKE_CXXFLAGS_RELEASE += -DNDEBUG -O2 -march=pentium3 -msse - INCLUDEPATH += ../include + INCLUDEPATH += . include ../include } macx-g++* { diff -r 1c9258dd155e -r f6fb85073d64 thread/Thread.cpp --- a/thread/Thread.cpp Tue Jun 02 09:53:01 2009 +0000 +++ b/thread/Thread.cpp Tue Jun 02 11:10:40 2009 +0000 @@ -259,6 +259,8 @@ #ifdef DEBUG_CONDITION cerr << "CONDITION DEBUG: " << (void *)GetCurrentThreadId() << ": Wait done on " << &m_condition << " \"" << m_name << "\"" << endl; #endif + + m_locked = true; } void