sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed crash when creating a network game.

Browse Source
This commit is contained in:
lotodore
2007-09-01 21:15:11 +00:00
parent b9aeb5497a
commit 096c02dd24
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+2 -1
View File
@@ -15,7 +15,7 @@
#include "gamedata.h" #include "gamedata.h"
gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c) gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c)
: QDialog(parent), myW(NULL), myConfig(c), currentGameName(""), isAdmin(false) : QDialog(parent), myW(NULL), mySession(NULL), myConfig(c), currentGameName(""), isAdmin(false)
{ {
setupUi(this); setupUi(this);
@@ -164,6 +164,7 @@ void gameLobbyDialogImpl::addConnectedPlayer(QString playerName, int rights) {
QTreeWidgetItem *item = new QTreeWidgetItem(treeWidget_connectedPlayers,0); QTreeWidgetItem *item = new QTreeWidgetItem(treeWidget_connectedPlayers,0);
item->setData(0, 0, playerName); item->setData(0, 0, playerName);
assert(mySession);
GameInfo info = mySession->getClientGameInfo(currentGameName.toUtf8().constData()); GameInfo info = mySession->getClientGameInfo(currentGameName.toUtf8().constData());
if(treeWidget_connectedPlayers->topLevelItemCount() != info.data.maxNumberOfPlayers) { if(treeWidget_connectedPlayers->topLevelItemCount() != info.data.maxNumberOfPlayers) {
src/gui/qt/mainwindow/mainwindowimpl.cpp
+4
View File
@@ -785,6 +785,8 @@ void mainWindowImpl::callCreateNetworkGameDialog() {
gameData.guiSpeed = myCreateNetworkGameDialog->spinBox_gameSpeed->value(); gameData.guiSpeed = myCreateNetworkGameDialog->spinBox_gameSpeed->value();
gameData.playerActionTimeoutSec = myCreateNetworkGameDialog->spinBox_netTimeOutPlayerAction->value(); gameData.playerActionTimeoutSec = myCreateNetworkGameDialog->spinBox_netTimeOutPlayerAction->value();
myGameLobbyDialog->setSession(&getSession());
myGameLobbyDialog->treeWidget_GameList->clear();
myStartNetworkGameDialog->setSession(&getSession()); myStartNetworkGameDialog->setSession(&getSession());
myStartNetworkGameDialog->treeWidget->clear(); myStartNetworkGameDialog->treeWidget->clear();
@@ -810,6 +812,8 @@ void mainWindowImpl::callJoinNetworkGameDialog() {
if (myServerGuiInterface.get()) if (myServerGuiInterface.get())
myServerGuiInterface->getSession().terminateNetworkServer(); myServerGuiInterface->getSession().terminateNetworkServer();
myGameLobbyDialog->setSession(&getSession());
myGameLobbyDialog->treeWidget_GameList->clear();
myStartNetworkGameDialog->setSession(&getSession()); myStartNetworkGameDialog->setSession(&getSession());
myStartNetworkGameDialog->treeWidget->clear(); myStartNetworkGameDialog->treeWidget->clear();
// Maybe use QUrl::toPunycode. // Maybe use QUrl::toPunycode.