Merge branch 'version-2.5.2-cdn-bugfix'

pizzaboxer · Oct 11, 2023 · 3439223 · 3439223
2 parents 19a46ef + 58cb431
commit 3439223
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj
@@ -7,8 +7,8 @@
  <UseWPF>true</UseWPF>
  <UseWindowsForms>True</UseWindowsForms>
  <ApplicationIcon>Bloxstrap.ico</ApplicationIcon>
- <Version>2.5.2</Version>
- <FileVersion>2.5.2.0</FileVersion>
+ <Version>2.5.3</Version>
+ <FileVersion>2.5.3.0</FileVersion>
  <ApplicationManifest>app.manifest</ApplicationManifest>
  </PropertyGroup>
 

diff --git a/Bloxstrap/RobloxDeployment.cs b/Bloxstrap/RobloxDeployment.cs
@@ -12,6 +12,7 @@ public static class RobloxDeployment
  {
  "https://setup.rbxcdn.com",
  "https://setup-ak.rbxcdn.com",
+ "https://roblox-setup.cachefly.net",
  "https://s3.amazonaws.com/setup.roblox.com"
  };
 
@@ -32,7 +33,11 @@ public static string BaseUrl
 
  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!");
  _baseUrl = attemptedUrl;
  break;
@@ -46,7 +51,7 @@ public static string 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;