summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-09-17 12:56:27 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-09-17 12:56:27 +0200
commitd47b8311d249a8bbccad9afec5c8ced53f6bff1a (patch)
treec16a212a6e657de7686cb6619e535cb9b605fcc2
parent169bd7eb0396cd8d9474e47b669f5db7bcaf38bf (diff)
proto-wine: Fix incorrect usage of mutex-locker
-rw-r--r--ftnoir_protocol_wine/ftnoir_protocol_wine.h9
1 files changed, 4 insertions, 5 deletions
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.