remove spurious 'refreshing' var
This commit is contained in:
@@ -21,7 +21,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
|
|||||||
{
|
{
|
||||||
GameServer currentServer;
|
GameServer currentServer;
|
||||||
ScrollItemWidget serverTemplate;
|
ScrollItemWidget serverTemplate;
|
||||||
bool refreshing;
|
|
||||||
|
|
||||||
enum SearchStatus { Fetching, Failed, NoGames, Hidden }
|
enum SearchStatus { Fetching, Failed, NoGames, Hidden }
|
||||||
SearchStatus searchStatus = SearchStatus.Fetching;
|
SearchStatus searchStatus = SearchStatus.Fetching;
|
||||||
@@ -51,14 +50,13 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
|
|||||||
|
|
||||||
// Menu buttons
|
// Menu buttons
|
||||||
var refreshButton = panel.GetWidget<ButtonWidget>("REFRESH_BUTTON");
|
var refreshButton = panel.GetWidget<ButtonWidget>("REFRESH_BUTTON");
|
||||||
refreshButton.IsDisabled = () => refreshing;
|
refreshButton.IsDisabled = () => searchStatus == SearchStatus.Fetching;
|
||||||
refreshButton.OnClick = () =>
|
refreshButton.OnClick = () =>
|
||||||
{
|
{
|
||||||
searchStatus = SearchStatus.Fetching;
|
searchStatus = SearchStatus.Fetching;
|
||||||
sl.RemoveChildren();
|
sl.RemoveChildren();
|
||||||
currentServer = null;
|
currentServer = null;
|
||||||
ServerList.Query(games => RefreshServerList(panel, games));
|
ServerList.Query(games => RefreshServerList(panel, games));
|
||||||
refreshing = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
var join = panel.GetWidget<ButtonWidget>("JOIN_BUTTON");
|
var join = panel.GetWidget<ButtonWidget>("JOIN_BUTTON");
|
||||||
@@ -99,7 +97,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
|
|||||||
infoPanel.GetWidget<LabelWidget>("MAP_TITLE").GetText = () => (CurrentMap() != null) ? CurrentMap().Title : "Unknown";
|
infoPanel.GetWidget<LabelWidget>("MAP_TITLE").GetText = () => (CurrentMap() != null) ? CurrentMap().Title : "Unknown";
|
||||||
infoPanel.GetWidget<LabelWidget>("MAP_PLAYERS").GetText = () => GetPlayersLabel(currentServer);
|
infoPanel.GetWidget<LabelWidget>("MAP_PLAYERS").GetText = () => GetPlayersLabel(currentServer);
|
||||||
|
|
||||||
refreshing = true;
|
|
||||||
ServerList.Query(games => RefreshServerList(panel, games));
|
ServerList.Query(games => RefreshServerList(panel, games));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -125,7 +122,6 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
|
|||||||
|
|
||||||
public void RefreshServerList(Widget panel, IEnumerable<GameServer> games)
|
public void RefreshServerList(Widget panel, IEnumerable<GameServer> games)
|
||||||
{
|
{
|
||||||
refreshing = false;
|
|
||||||
var sl = panel.GetWidget<ScrollPanelWidget>("SERVER_LIST");
|
var sl = panel.GetWidget<ScrollPanelWidget>("SERVER_LIST");
|
||||||
|
|
||||||
sl.RemoveChildren();
|
sl.RemoveChildren();
|
||||||
|
|||||||
Reference in New Issue
Block a user