krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Browser] Do not try to open window if server is no more reachable

Browse source
This commit is contained in:
Koncord 2017-05-27 11:25:00 +08:00
parent c8eb0f0eae
commit ec5d1b7a86
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/browser/MainWindow.cpp
View file

@ -121,7 +121,13 @@ void MainWindow::play()
int sourceId = proxyModel->mapToSource(proxyModel->index(id, ServerData::ADDR)).row(); int sourceId = proxyModel->mapToSource(proxyModel->index(id, ServerData::ADDR)).row();
infoDialog.Server(sm->myData[sourceId].addr); infoDialog.Server(sm->myData[sourceId].addr);
infoDialog.refresh();
if (!infoDialog.refresh())
{
queryHelper->refresh();
return;
}
if(!infoDialog.exec()) if(!infoDialog.exec())
return; return;

8
apps/browser/ServerInfoDialog.cpp
View file

@ -28,7 +28,7 @@ void ServerInfoDialog::Server(QString addr)
this->addr = addr; this->addr = addr;
} }
void ServerInfoDialog::refresh() bool ServerInfoDialog::refresh()
{ {
QStringList list = addr.split(':'); QStringList list = addr.split(':');
auto sd = QueryClient::Get().Update(SystemAddress(list[0].toLatin1(), list[1].toUShort())); auto sd = QueryClient::Get().Update(SystemAddress(list[0].toLatin1(), list[1].toUShort()));
@ -43,15 +43,11 @@ void ServerInfoDialog::refresh()
listPlayers->clear(); listPlayers->clear();
for(auto player : sd.second.players) for(auto player : sd.second.players)
{
listPlayers->addItem(QString::fromStdString(player)); listPlayers->addItem(QString::fromStdString(player));
};
listPlugins->clear(); listPlugins->clear();
for(auto plugin : sd.second.plugins) for(auto plugin : sd.second.plugins)
{
listPlugins->addItem(QString::fromStdString(plugin.name)); listPlugins->addItem(QString::fromStdString(plugin.name));
}
listRules->clear(); listRules->clear();
const static vector<std::string> defaultRules {"gamemode", "maxPlayers", "name", "passw", "players", "version"}; const static vector<std::string> defaultRules {"gamemode", "maxPlayers", "name", "passw", "players", "version"};
@ -68,5 +64,7 @@ void ServerInfoDialog::refresh()
} }
lblPlayers->setText(QString::number(sd.second.players.size()) + " / " + QString::number(sd.second.GetMaxPlayers())); lblPlayers->setText(QString::number(sd.second.players.size()) + " / " + QString::number(sd.second.GetMaxPlayers()));
return true;
} }
return false;
} }

2
apps/browser/ServerInfoDialog.hpp
View file

@ -15,7 +15,7 @@ public:
virtual ~ServerInfoDialog(); virtual ~ServerInfoDialog();
void Server(QString addr); void Server(QString addr);
public slots: public slots:
void refresh(); bool refresh();
private: private:
QString addr; QString addr;
}; };