repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: bump version to 1.6.3. check the client version, not the server version in libce...
[deb_libcec.git]
/
src
/
lib
/
platform
/
threads
/
threads.h
diff --git
a/src/lib/platform/threads/threads.h
b/src/lib/platform/threads/threads.h
index 0cc07eee883f6646e98bd65b6cfb601f5d8c1c96..ead0ebdcb18c5e53525f60bb1882cdf9f12fabe6 100644
(file)
--- a/
src/lib/platform/threads/threads.h
+++ b/
src/lib/platform/threads/threads.h
@@
-41,14
+41,18
@@
namespace PLATFORM
CThread(void) :
m_bStop(false),
m_bRunning(false),
CThread(void) :
m_bStop(false),
m_bRunning(false),
- m_bStopped(false) {}
+ m_bStopped(false),
+ m_thread(NULL) {}
virtual ~CThread(void)
{
StopThread(0);
void *retVal;
virtual ~CThread(void)
{
StopThread(0);
void *retVal;
- ThreadsWait(m_thread, &retVal);
+ if (m_thread)
+ ThreadsWait(m_thread, &retVal);
+ #if defined(__WINDOWS__)
(void *)retVal; //"unreferenced local variable" warning
(void *)retVal; //"unreferenced local variable" warning
+ #endif
}
static void *ThreadHandler(CThread *thread)
}
static void *ThreadHandler(CThread *thread)
@@
-143,13
+147,13
@@
namespace PLATFORM
protected:
void SetRunning(bool bSetTo);
protected:
void SetRunning(bool bSetTo);
+ CMutex m_threadMutex;
private:
bool m_bStop;
bool m_bRunning;
bool m_bStopped;
CCondition<bool> m_threadCondition;
private:
bool m_bStop;
bool m_bRunning;
bool m_bStopped;
CCondition<bool> m_threadCondition;
- CMutex m_threadMutex;
thread_t m_thread;
};
};
thread_t m_thread;
};
};