Merge branch 'version-2.5.2-cdn-bugfix'

This commit is contained in:
pizzaboxer 2023-10-11 14:09:45 +01:00
commit 3439223e0c
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
2 changed files with 9 additions and 4 deletions

View File

@ -7,8 +7,8 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<UseWindowsForms>True</UseWindowsForms> <UseWindowsForms>True</UseWindowsForms>
<ApplicationIcon>Bloxstrap.ico</ApplicationIcon> <ApplicationIcon>Bloxstrap.ico</ApplicationIcon>
<Version>2.5.2</Version> <Version>2.5.3</Version>
<FileVersion>2.5.2.0</FileVersion> <FileVersion>2.5.3.0</FileVersion>
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup> </PropertyGroup>

View File

@ -12,6 +12,7 @@
{ {
"https://setup.rbxcdn.com", "https://setup.rbxcdn.com",
"https://setup-ak.rbxcdn.com", "https://setup-ak.rbxcdn.com",
"https://roblox-setup.cachefly.net",
"https://s3.amazonaws.com/setup.roblox.com" "https://s3.amazonaws.com/setup.roblox.com"
}; };
@ -32,7 +33,11 @@
try try
{ {
App.HttpClient.GetAsync($"{attemptedUrl}/version").Wait(); var response = App.HttpClient.GetAsync($"{attemptedUrl}/version").Result;
if (!response.IsSuccessStatusCode)
throw new HttpResponseException(response);
App.Logger.WriteLine(LOG_IDENT, "Connection successful!"); App.Logger.WriteLine(LOG_IDENT, "Connection successful!");
_baseUrl = attemptedUrl; _baseUrl = attemptedUrl;
break; break;
@ -46,7 +51,7 @@
} }
if (string.IsNullOrEmpty(_baseUrl)) if (string.IsNullOrEmpty(_baseUrl))
throw new Exception("Unable to find an accessible Roblox deploy mirror!"); throw new Exception("Could not find an accessible Roblox deployment mirror, likely due to a bad internet connection. Please launch again.");
} }
return _baseUrl; return _baseUrl;