Fixed nasty GUI update bug in game list. Fixed compiler warning.
This commit is contained in:
@@ -22,13 +22,14 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c)
|
|||||||
connect( pushButton_CreateGame, SIGNAL( clicked() ), this, SLOT( createGame() ) );
|
connect( pushButton_CreateGame, SIGNAL( clicked() ), this, SLOT( createGame() ) );
|
||||||
connect( pushButton_JoinGame, SIGNAL( clicked() ), this, SLOT( joinGame() ) );
|
connect( pushButton_JoinGame, SIGNAL( clicked() ), this, SLOT( joinGame() ) );
|
||||||
connect( treeWidget_GameList, SIGNAL( currentItemChanged ( QTreeWidgetItem*, QTreeWidgetItem*) ), this, SLOT( gameSelected(QTreeWidgetItem*, QTreeWidgetItem*) ) );
|
connect( treeWidget_GameList, SIGNAL( currentItemChanged ( QTreeWidgetItem*, QTreeWidgetItem*) ), this, SLOT( gameSelected(QTreeWidgetItem*, QTreeWidgetItem*) ) );
|
||||||
|
|
||||||
|
clearDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
void gameLobbyDialogImpl::exec()
|
void gameLobbyDialogImpl::exec()
|
||||||
{
|
{
|
||||||
clearDialog();
|
|
||||||
|
|
||||||
QDialog::exec();
|
QDialog::exec();
|
||||||
|
clearDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -31,16 +31,17 @@ startNetworkGameDialogImpl::startNetworkGameDialogImpl(QWidget *parent, ConfigFi
|
|||||||
connect( pushButton_startGame, SIGNAL( clicked() ), this, SLOT( startGame() ) );
|
connect( pushButton_startGame, SIGNAL( clicked() ), this, SLOT( startGame() ) );
|
||||||
connect( pushButton_Kick, SIGNAL( clicked() ), this, SLOT( kickPlayer() ) );
|
connect( pushButton_Kick, SIGNAL( clicked() ), this, SLOT( kickPlayer() ) );
|
||||||
connect( treeWidget, SIGNAL( currentItemChanged ( QTreeWidgetItem*, QTreeWidgetItem*) ), this, SLOT( playerSelected(QTreeWidgetItem*, QTreeWidgetItem*) ) );
|
connect( treeWidget, SIGNAL( currentItemChanged ( QTreeWidgetItem*, QTreeWidgetItem*) ), this, SLOT( playerSelected(QTreeWidgetItem*, QTreeWidgetItem*) ) );
|
||||||
|
|
||||||
|
clearDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
void startNetworkGameDialogImpl::exec() {
|
void startNetworkGameDialogImpl::exec() {
|
||||||
|
|
||||||
clearDialog();
|
|
||||||
|
|
||||||
GameInfo info = mySession->getClientGameInfo(0);
|
GameInfo info = mySession->getClientGameInfo(0);
|
||||||
label_maxPlayerNumber->setText(QString::number(info.data.maxNumberOfPlayers));
|
label_maxPlayerNumber->setText(QString::number(info.data.maxNumberOfPlayers));
|
||||||
|
|
||||||
QDialog::exec();
|
QDialog::exec();
|
||||||
|
clearDialog();
|
||||||
}
|
}
|
||||||
|
|
||||||
void startNetworkGameDialogImpl::startGame() {
|
void startNetworkGameDialogImpl::startGame() {
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ private:
|
|||||||
|
|
||||||
|
|
||||||
ServerLobbyThread::ServerLobbyThread(GuiInterface &gui, ConfigFile *playerConfig)
|
ServerLobbyThread::ServerLobbyThread(GuiInterface &gui, ConfigFile *playerConfig)
|
||||||
: m_gui(gui), m_playerConfig(playerConfig), m_curUniquePlayerId(0), m_curGameId(0)
|
: m_gui(gui), m_playerConfig(playerConfig), m_curGameId(0), m_curUniquePlayerId(0)
|
||||||
{
|
{
|
||||||
m_senderCallback.reset(new ServerSenderCallback(*this));
|
m_senderCallback.reset(new ServerSenderCallback(*this));
|
||||||
m_sender.reset(new SenderThread(GetSenderCallback()));
|
m_sender.reset(new SenderThread(GetSenderCallback()));
|
||||||
|
|||||||
Reference in New Issue
Block a user