Skip to content

Commit f36d296

Browse files
committed
Renamed setting to "Show popup for recovered scene after editor crash"
1 parent 4c89ebf commit f36d296

4 files changed

Lines changed: 15 additions & 15 deletions

File tree

UnityLauncherPro/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@
741741
<CheckBox x:Name="chkFetchAdditionalInfo" Content="Fetch additional info about Editor" ToolTip="Reads releases API for security related info" Checked="chkFetchAdditionalInfo_Checked" Unchecked="chkFetchAdditionalInfo_Checked"/>
742742
<CheckBox x:Name="chkFetchOnlineTemplates" Content="New Project window: Fetch online templates" ToolTip="Automatically fetch template listfrom Unity servers" Checked="chkFetchOnlineTemplates_Checked" Unchecked="chkFetchOnlineTemplates_Checked"/>
743743
<CheckBox x:Name="chkStreamerMode" Content="Streamer Mode (hide project names and folders)" ToolTip="Hide project names and folders in main view" Checked="ChkStreamerMode_Checked" Unchecked="ChkStreamerMode_Checked" HorizontalAlignment="Left"/>
744-
<CheckBox x:Name="chkDeleteRecoveredScene" Content="Delete recovered scene after editor crash" ToolTip="Delete recovered scene or display load popup" Checked="ChkDeleteRecoveredScene_Checked" Unchecked="ChkDeleteRecoveredScene_Checked" HorizontalAlignment="Left"/>
744+
<CheckBox x:Name="chkShowRecoveredScenePopup" Content="Show popup for recovered scene after editor crash" ToolTip="After editor crash, show a popup to load recovered scene (or delete it)" Checked="chkShowRecoveredScenePopup_Checked" Unchecked="chkShowRecoveredScenePopup_Checked" HorizontalAlignment="Left"/>
745745
<!--<StackPanel Orientation="Horizontal" Margin="0,0,0,4">
746746
<TextBox x:Name="txtTemplatePackagesFolder" BorderBrush="Transparent" CaretBrush="{DynamicResource ThemeSearchCaret}" Background="{DynamicResource ThemeTextBoxBackground}" SelectionBrush="{DynamicResource ThemeSearchSelection}" Foreground="{DynamicResource ThemeSearchForeground}" ToolTip="Folder for your custom unitypackage templates (for new project)" Padding="0,3,0,0" Width="110" TextChanged="TxtTemplatePackagesFolder_TextChanged" />
747747
<Button Style="{StaticResource CustomButton}" x:Name="btnBrowseTemplateUnityPackagesFolder" Content="..." Margin="6,0,0,0" MinWidth="22" MinHeight="22" FontSize="16" ToolTip="Browse for new projects root folder.." Click="BtnBrowseTemplateUnityPackagesFolder_Click" />

UnityLauncherPro/MainWindow.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ void LoadSettings()
583583
chkAskNameForQuickProject.IsChecked = Settings.Default.askNameForQuickProject;
584584
chkEnableProjectRename.IsChecked = Settings.Default.enableProjectRename;
585585
chkStreamerMode.IsChecked = Settings.Default.streamerMode;
586-
chkDeleteRecoveredScene.IsChecked = Settings.Default.deleteRecoveredScene;
586+
chkShowRecoveredScenePopup.IsChecked = Settings.Default.showRecoveredScenePopup;
587587
chkShowPlatform.IsChecked = Settings.Default.showTargetPlatform;
588588
chkCheckSRP.IsChecked = Settings.Default.checkSRP;
589589
chkUseCustomTheme.IsChecked = Settings.Default.useCustomTheme;
@@ -2220,11 +2220,11 @@ private void ChkStreamerMode_Checked(object sender, RoutedEventArgs e)
22202220
SetStatus("Streamer mode " + (isChecked ? "enabled" : "disabled"), MessageType.Info);
22212221
}
22222222

2223-
private void ChkDeleteRecoveredScene_Checked(object sender, RoutedEventArgs e)
2223+
private void chkShowRecoveredScenePopup_Checked(object sender, RoutedEventArgs e)
22242224
{
22252225
var isChecked = (bool)((CheckBox)sender).IsChecked;
22262226

2227-
Settings.Default.deleteRecoveredScene = isChecked;
2227+
Settings.Default.showRecoveredScenePopup = isChecked;
22282228
Settings.Default.Save();
22292229
}
22302230

UnityLauncherPro/Properties/Settings.Designer.cs

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UnityLauncherPro/Tools.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -411,12 +411,7 @@ static bool CheckCrashBackupScene(string projectPath)
411411
var recoveryFile = Path.Combine(projectPath, "Temp", "__Backupscenes", "0.backup");
412412
if (File.Exists(recoveryFile))
413413
{
414-
if (Settings.Default.deleteRecoveredScene)
415-
{
416-
File.Delete(recoveryFile);
417-
Directory.Delete(Path.GetDirectoryName(recoveryFile));
418-
}
419-
else
414+
if (Settings.Default.showRecoveredScenePopup)
420415
{
421416
var result = MessageBox.Show("Crash recovery scene found, do you want to MOVE it into Assets/_Recovery/-folder?", "UnityLauncherPro - Scene Recovery", MessageBoxButton.YesNo, MessageBoxImage.Question);
422417
if (result == MessageBoxResult.Yes)
@@ -459,7 +454,12 @@ static bool CheckCrashBackupScene(string projectPath)
459454
{
460455
cancelRunningUnity = true;
461456
}
462-
}
457+
}
458+
else
459+
{
460+
File.Delete(recoveryFile);
461+
Directory.Delete(Path.GetDirectoryName(recoveryFile));
462+
}
463463
}
464464
return cancelRunningUnity;
465465
}

0 commit comments

Comments
 (0)