From d47b8311d249a8bbccad9afec5c8ced53f6bff1a Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Tue, 17 Sep 2013 12:56:27 +0200 Subject: proto-wine: Fix incorrect usage of mutex-locker --- ftnoir_protocol_wine/ftnoir_protocol_wine.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'ftnoir_protocol_wine') diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.h b/ftnoir_protocol_wine/ftnoir_protocol_wine.h index c4837992..300501ad 100644 --- a/ftnoir_protocol_wine/ftnoir_protocol_wine.h +++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.h @@ -52,7 +52,10 @@ public: bool checkServerInstallationOK(); void sendHeadposeToGame(double* headpose, double* rawheadpose ); - + QString getGameName() { + QMutexLocker foo(&game_name_mutex); + return connected_game; + } private: PortableLockedShm lck_shm; WineSHM* shm; @@ -60,10 +63,6 @@ private: int gameid; QString connected_game; QMutex game_name_mutex; - QString getGameName() { - QMutexLocker((QMutex*)&game_name_mutex); - return connected_game; - } }; // Widget that has controls for FTNoIR protocol client-settings. -- cgit v1.2.3