Skip to content

Commit 1c20488

Browse files
bdidk235bdidk235
authored
Merge branch 'bloxstraplabs:main' into wip
2 parents aedaef1 + 4da4641 commit 1c20488

File tree

5 files changed

+36
-40
lines changed

5 files changed

+36
-40
lines changed

‎Bloxstrap/Bloxstrap.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<UseWPF>true</UseWPF>
88
<UseWindowsForms>True</UseWindowsForms>
99
<ApplicationIcon>Bloxstrap.ico</ApplicationIcon>
10-
<Version>2.8.4</Version>
11-
<FileVersion>2.8.4</FileVersion>
10+
<Version>2.8.5</Version>
11+
<FileVersion>2.8.5</FileVersion>
1212
<ApplicationManifest>app.manifest</ApplicationManifest>
1313
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1414
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>

‎Bloxstrap/Bootstrapper.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ private void CleanupVersionsFolder()
681681
{
682682
Directory.Delete(dir, true);
683683
}
684-
catch (IOException ex)
684+
catch (Exception ex)
685685
{
686686
App.Logger.WriteLine(LOG_IDENT, $"Failed to delete {dir}");
687687
App.Logger.WriteException(LOG_IDENT, ex);
@@ -709,21 +709,19 @@ private void MigrateCompatibilityFlags()
709709
}
710710
}
711711

712-
private void KillRunningRobloxInDirectory(string path)
712+
private static void KillRobloxPlayers()
713713
{
714-
const string LOG_IDENT = "Bootstrapper::KillRunningRobloxInDirectory";
714+
const string LOG_IDENT = "Bootstrapper::KillRobloxPlayers";
715715

716716
List<Process> processes = new List<Process>();
717-
processes.AddRange(Process.GetProcessesByName(IsStudioLaunch ? "RobloxStudioBeta" : "RobloxPlayerBeta"));
718-
processes.AddRange(Process.GetProcessesByName("RobloxCrashHandler"));
717+
processes.AddRange(Process.GetProcessesByName("RobloxPlayerBeta"));
718+
processes.AddRange(Process.GetProcessesByName("RobloxCrashHandler")); // roblox studio doesnt depend on crash handler being open, so this should be fine
719719

720720
foreach (Process process in processes)
721721
{
722722
try
723723
{
724-
string? processPath = process.MainModule?.FileName;
725-
if (processPath != null && processPath.StartsWith(path))
726-
process.Kill();
724+
process.Kill();
727725
}
728726
catch (Exception ex)
729727
{
@@ -748,9 +746,11 @@ private async Task UpgradeRoblox()
748746

749747
_isInstalling = true;
750748

751-
// make sure nothing is running from the latest version directory before deleting the whole directory
752-
KillRunningRobloxInDirectory(_latestVersionDirectory);
749+
// make sure nothing is running before continuing upgrade
750+
if (!IsStudioLaunch) // TODO: wait for studio processes to close before updating to prevent data loss
751+
KillRobloxPlayers();
753752

753+
// get a fully clean install
754754
if (Directory.Exists(_latestVersionDirectory))
755755
{
756756
try

‎Bloxstrap/Installer.cs

+10-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ namespace Bloxstrap
55
{
66
internal class Installer
77
{
8+
/// <summary>
9+
/// Should this version automatically open the release notes page?
10+
/// Recommended for major updates only.
11+
/// </summary>
12+
private const bool OpenReleaseNotes = false;
13+
814
private static string DesktopShortcut => Path.Combine(Paths.Desktop, $"{App.ProjectName}.lnk");
915

1016
private static string StartMenuShortcut => Path.Combine(Paths.WindowsStartMenu, $"{App.ProjectName}.lnk");
@@ -602,7 +608,10 @@ public static void HandleUpgrade()
602608

603609
if (isAutoUpgrade)
604610
{
605-
Utilities.ShellExecute($"https://github.com/{App.ProjectRepository}/wiki/Release-notes-for-Bloxstrap-v{currentVer}");
611+
#pragma warning disable CS0162 // Unreachable code detected
612+
if (OpenReleaseNotes)
613+
Utilities.ShellExecute($"https://github.com/{App.ProjectRepository}/wiki/Release-notes-for-Bloxstrap-v{currentVer}");
614+
#pragma warning restore CS0162 // Unreachable code detected
606615
}
607616
else
608617
{

‎Bloxstrap/Resources/Strings.fr.resx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1239,9 +1239,9 @@ Voulez-vous activer le mode test ?</value>
12391239
<value>Version {0}</value>
12401240
</data>
12411241
<data name="Bootstrapper.FilesInUse" xml:space="preserve">
1242-
<value>Bloxstrap a tenté de mettre Roblox à jour mais a échoué car des fichiers de Roblox sont ouverts.
1242+
<value>Bloxstrap a tenté de mettre Roblox à jour mais a échoué car des fichiers de Roblox sont utilisés.
12431243

1244-
Veuillez fermer toute application pouvant utiliser des fichiers de Roblox, et relancez.</value>
1244+
Veuillez fermer toute application pouvant utiliser les fichiers de Roblox, et relancez.</value>
12451245
<comment>This is *not* for when Roblox is still running when trying to upgrade. This applies to files being open (i.e. image assets)</comment>
12461246
</data>
12471247
<data name="FileTypes.ZipArchive" xml:space="preserve">
@@ -1259,7 +1259,7 @@ Veuillez fermer toute application pouvant utiliser des fichiers de Roblox, et re
12591259
<value>Rassemble des informations pouvant être téléversées en ligne pour remédier à un problème.</value>
12601260
</data>
12611261
<data name="Menu.Bloxstrap.ExportData.ExportConfig" xml:space="preserve">
1262-
<value>Configuration Bloxstrap</value>
1262+
<value>Configuration de Bloxstrap</value>
12631263
<comment>Label that appears next to a checkbox</comment>
12641264
</data>
12651265
<data name="Menu.Bloxstrap.ExportData.ExportLogs" xml:space="preserve">

‎Bloxstrap/UI/Elements/About/Pages/TranslatorsPage.xaml

+11-24
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,6 @@
2424
</Grid.ColumnDefinitions>
2525

2626
<StackPanel Grid.Column="0">
27-
<!--<TextBlock Text="Bahasa Indonesia" FontSize="16" FontWeight="Medium">
28-
<TextBlock.Foreground>
29-
<SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
30-
</TextBlock.Foreground>
31-
</TextBlock>
32-
<TextBlock Text="AriaP" />
33-
<TextBlock Text="e7leopard" />
34-
<TextBlock Text="hfzrk" />
35-
<TextBlock Text="nabbyowo" />
36-
<TextBlock Text="Nayottamaa" />
37-
<TextBlock Text="niluhfitriani4" />
38-
<TextBlock Text="SenZore" />
39-
<TextBlock Text="soudblox" />-->
40-
4127
<!--<TextBlock Text="Bokmål" FontSize="16" FontWeight="Medium" Margin="0,16,0,0">
4228
<TextBlock.Foreground>
4329
<SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
@@ -230,16 +216,6 @@
230216
<TextBlock Text="Elotomka" />
231217
<TextBlock Text="xM4rk1" />
232218

233-
<!--<TextBlock Text="Nederlands" FontSize="16" FontWeight="Medium" Margin="0,16,0,0">
234-
<TextBlock.Foreground>
235-
<SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
236-
</TextBlock.Foreground>
237-
</TextBlock>
238-
<TextBlock Text="Cosmix" />
239-
<TextBlock Text="Miwwzy" />
240-
<TextBlock Text="Quickvision1" />
241-
<TextBlock Text="ydboss" />-->
242-
243219
<TextBlock Text="Polski" FontSize="16" FontWeight="Medium" Margin="0,16,0,0">
244220
<TextBlock.Foreground>
245221
<SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
@@ -601,6 +577,17 @@
601577
<TextBlock Text="yuzegh" />
602578
<TextBlock Text="Ardaniho" />
603579
<TextBlock Text="LeventGameing" />
580+
581+
<TextBlock Text="Malay" FontSize="16" FontWeight="Medium" Margin="0,16,0,0">
582+
<TextBlock.Foreground>
583+
<SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
584+
</TextBlock.Foreground>
585+
</TextBlock>
586+
<TextBlock Text="so1ehee" />
587+
<TextBlock Text="Suchan96" />
588+
<TextBlock Text="ShdyDayz" />
589+
<TextBlock Text="cyanpyxl" />
590+
<TextBlock Text="CormacZ" />
604591
</StackPanel>
605592
</Grid>
606593
</StackPanel>

0 commit comments

Comments
 (0)