(657674526) Reallow changing resolution in fullscreen/borderless. TODO: test, disable in borderless because it seems to do nothing?

This commit is contained in:
Joonas Rikkonen
2019-06-04 16:00:57 +03:00
parent edccfe223d
commit 12ad53297d
3 changed files with 11 additions and 8 deletions
@@ -199,6 +199,10 @@ namespace Barotrauma
UserData = "noresults"
};
}
else
{
joinButton.Enabled = false;
}
return true;
}
@@ -559,6 +563,13 @@ namespace Barotrauma
.Replace("[statuscode]", masterServerResponse.StatusCode.ToString())
.Replace("[statusdescription]", masterServerResponse.StatusDescription));
break;
case System.Net.HttpStatusCode.ServiceUnavailable:
new GUIMessageBox(TextManager.Get("MasterServerErrorLabel"),
TextManager.Get("MasterServerErrorUnavailable")
.Replace("[masterserverurl]", NetConfig.MasterServerUrl)
.Replace("[statuscode]", masterServerResponse.StatusCode.ToString())
.Replace("[statusdescription]", masterServerResponse.StatusDescription));
break;
case System.Net.HttpStatusCode.ServiceUnavailable:
new GUIMessageBox(TextManager.Get("MasterServerErrorLabel"),
TextManager.Get("MasterServerErrorUnavailable"));