Mercurial > hg > qm-dsp
changeset 296:f6fb85073d64
* Condition fix (caused hang)
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Tue, 02 Jun 2009 11:10:40 +0000 |
| parents | 1c9258dd155e |
| children | b74f91bd5c7d |
| files | qm-dsp.pro thread/Thread.cpp |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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++* {
--- 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