From e3021d2c5c3eeace8d5c2d711bd513cf6cf9988d Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Sun, 4 Apr 2010 13:25:19 +0200 Subject: [PATCH 1/2] minor qt 4.5 fix --- cockatrice/src/zoneviewwidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/cockatrice/src/zoneviewwidget.cpp b/cockatrice/src/zoneviewwidget.cpp index a6b405e9..892f9653 100644 --- a/cockatrice/src/zoneviewwidget.cpp +++ b/cockatrice/src/zoneviewwidget.cpp @@ -12,6 +12,7 @@ ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberC : QGraphicsWidget(0, Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowSystemMenuHint | Qt::WindowTitleHint/* | Qt::WindowCloseButtonHint*/), player(_player) { setAttribute(Qt::WA_DeleteOnClose); + setZValue(100); QFont font; font.setPixelSize(10); From 6df69f60a61aaf9e67339a4caeb8e7f492a68de0 Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Sun, 4 Apr 2010 15:35:24 +0200 Subject: [PATCH 2/2] minor servatrice fix --- common/server_game.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/server_game.cpp b/common/server_game.cpp index 79ff341d..dea8bbf7 100644 --- a/common/server_game.cpp +++ b/common/server_game.cpp @@ -198,11 +198,12 @@ void Server_Game::removePlayer(Server_Player *player) { players.remove(player->getPlayerId()); sendGameEvent(new Event_Leave(player->getPlayerId())); + bool spectator = player->getSpectator(); delete player; if (!getPlayerCount()) deleteLater(); - else + else if (!spectator) stopGameIfFinished(); qobject_cast(parent())->broadcastGameListUpdate(this); }