Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
63fe3443
Unverified
Commit
63fe3443
authored
May 02, 2021
by
ebbit1q
Committed by
GitHub
May 01, 2021
Browse files
fix deprecation of QMutex::Recursive in favor of QRecursiveMutex (#4328)
parent
10628943
Changes
2
Hide whitespace changes
Inline
Side-by-side
common/server_game.cpp
View file @
63fe3443
...
...
@@ -69,7 +69,11 @@ Server_Game::Server_Game(const ServerInfo_User &_creatorInfo,
spectatorsNeedPassword
(
_spectatorsNeedPassword
),
spectatorsCanTalk
(
_spectatorsCanTalk
),
spectatorsSeeEverything
(
_spectatorsSeeEverything
),
inactivityCounter
(
0
),
startTimeOfThisGame
(
0
),
secondsElapsed
(
0
),
firstGameStarted
(
false
),
turnOrderReversed
(
false
),
startTime
(
QDateTime
::
currentDateTime
()),
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
gameMutex
()
#else
gameMutex
(
QMutex
::
Recursive
)
#endif
{
currentReplay
=
new
GameReplay
;
currentReplay
->
set_replay_id
(
room
->
getServer
()
->
getDatabaseInterface
()
->
getNextReplayId
());
...
...
common/server_game.h
View file @
63fe3443
...
...
@@ -88,7 +88,11 @@ private slots:
void
doStartGameIfReady
();
public:
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
mutable
QRecursiveMutex
gameMutex
;
#else
mutable
QMutex
gameMutex
;
#endif
Server_Game
(
const
ServerInfo_User
&
_creatorInfo
,
int
_gameId
,
const
QString
&
_description
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment