From 98a04668a0761b67c2b5f41d6df9dd8c3bcfc36d Mon Sep 17 00:00:00 2001 From: Max-Wilhelm Bruker Date: Sat, 29 Aug 2009 18:53:30 +0200 Subject: [PATCH] crash fix, translation fix --- cockatrice/cockatrice.pro | 1 + cockatrice/src/gameselector.cpp | 8 +++++++- cockatrice/translations/cockatrice_de.ts | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cockatrice/cockatrice.pro b/cockatrice/cockatrice.pro index c3cc92a7..1bb40585 100644 --- a/cockatrice/cockatrice.pro +++ b/cockatrice/cockatrice.pro @@ -86,3 +86,4 @@ SOURCES += src/counter.cpp \ src/phasestoolbar.cpp \ src/chatwidget.cpp TRANSLATIONS += translations/cockatrice_de.ts translations/cockatrice_en.ts +CONFIG += qt debug diff --git a/cockatrice/src/gameselector.cpp b/cockatrice/src/gameselector.cpp index 65c5c94e..58a8cdd5 100644 --- a/cockatrice/src/gameselector.cpp +++ b/cockatrice/src/gameselector.cpp @@ -77,6 +77,9 @@ void GameSelector::actJoin() void GameSelector::enableGameList() { + if (isVisible()) + return; + connect(client, SIGNAL(gameListEvent(ServerGame *)), gameListModel, SLOT(updateGameList(ServerGame *))); client->listGames(); show(); @@ -84,7 +87,10 @@ void GameSelector::enableGameList() void GameSelector::disableGameList() { - disconnect(client, 0, this, 0); + if (!isVisible()) + return; + + disconnect(client, 0, gameListModel, 0); hide(); gameListModel->cleanList(); } diff --git a/cockatrice/translations/cockatrice_de.ts b/cockatrice/translations/cockatrice_de.ts index bed251b5..e49c4b32 100644 --- a/cockatrice/translations/cockatrice_de.ts +++ b/cockatrice/translations/cockatrice_de.ts @@ -1160,7 +1160,7 @@ %1 sets counter "%2" to %3 (%4%5). - %1 setzt Zählmarke "%2" auf %3% (%4%5). + %1 setzt Zählmarke "%2" auf %3 (%4%5). %1 is looking at the top %2 cards of %3.