summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_protocol_wine
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-04-27 13:02:05 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-04-27 13:02:05 +0200
commit3771a1c5639814b18fab908f863299f5e23de3da (patch)
tree8b22fa3823930da6f5f17e29a4ea523e55465dbf /ftnoir_protocol_wine
parent73e3da175c5145278593825277939a3524f0a57f (diff)
Unbreak Wine protocol
Diffstat (limited to 'ftnoir_protocol_wine')
-rw-r--r--ftnoir_protocol_wine/ftnoir_protocol_wine.cpp2
-rw-r--r--ftnoir_protocol_wine/ftnoir_protocol_wine.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine.cpp
index 9169d5cc..23d50fd1 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)
+FTNoIR_Protocol::FTNoIR_Protocol() : lck_shm(WINE_SHM_NAME, WINE_MTX_NAME, sizeof(WineSHM)), shm(NULL), gameid(0), game_name_mutex()
{
if (lck_shm.mem != (void*) -1) {
shm = (WineSHM*) lck_shm.mem;
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.h b/ftnoir_protocol_wine/ftnoir_protocol_wine.h
index 0c20d3e1..c5bfb37e 100644
--- a/ftnoir_protocol_wine/ftnoir_protocol_wine.h
+++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.h
@@ -60,11 +60,11 @@ private:
WineSHM* shm;
QProcess wrapper;
int gameid;
- QString game_name;
+ QString connected_game;
QMutex game_name_mutex;
QString getGameName() {
QMutexLocker(&game_name_mutex);
- return game_name;
+ return connected_game;
}
};