summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_protocol_wine
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-04-27 13:03:15 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-04-27 13:03:15 +0200
commitc88b37809815f05309aa3615950927ecac8d9849 (patch)
tree344b9844cf4b16bd66a27e8ee09808c720b45817 /ftnoir_protocol_wine
parent3771a1c5639814b18fab908f863299f5e23de3da (diff)
Really unbreak wine this time
Diffstat (limited to 'ftnoir_protocol_wine')
-rw-r--r--ftnoir_protocol_wine/ftnoir_protocol_wine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
index 23d50fd1..60c09d98 100644
--- a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
+++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
@@ -41,7 +41,7 @@
#include <fcntl.h> /* For O_* constants */
/** constructor **/
-FTNoIR_Protocol::FTNoIR_Protocol() : lck_shm(WINE_SHM_NAME, WINE_MTX_NAME, sizeof(WineSHM)), shm(NULL), gameid(0), game_name_mutex()
+FTNoIR_Protocol::FTNoIR_Protocol() : lck_shm(WINE_SHM_NAME, WINE_MTX_NAME, sizeof(WineSHM)), shm(NULL), gameid(0)
{
if (lck_shm.mem != (void*) -1) {
shm = (WineSHM*) lck_shm.mem;
@@ -82,7 +82,7 @@ void FTNoIR_Protocol::sendHeadposeToGame( double *headpose, double *rawheadpose
bool tmp1, tmp2;
CSV::getGameData(id_str, tmp1, tmp2, shm->table, gamename);
gameid = shm->gameid2 = shm->gameid;
- QMutexLocker(&game_name_mutex);
+ QMutexLocker((QMutex*)&game_name_mutex);
connected_game = gamename;
}
lck_shm.unlock();