mirror of
https://github.com/bloxstraplabs/bloxstrap.git
synced 2025-04-21 10:01:27 -07:00
Fix quiet launching
Since this isn't a WinForms app anymore, there's no need to start the bootstrapper dialog as a new application with Application.Run.
This commit is contained in:
parent
d7b8efbc2c
commit
000de99c37
@ -1,8 +1,7 @@
|
|||||||
<Application x:Class="Bloxstrap.App"
|
<Application x:Class="Bloxstrap.App"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:local="clr-namespace:Bloxstrap"
|
xmlns:local="clr-namespace:Bloxstrap">
|
||||||
StartupUri="MainWindow.xaml">
|
|
||||||
<Application.Resources>
|
<Application.Resources>
|
||||||
|
|
||||||
</Application.Resources>
|
</Application.Resources>
|
||||||
|
@ -91,9 +91,6 @@ namespace Bloxstrap
|
|||||||
// this is called from BootstrapperStyleForm.SetupDialog()
|
// this is called from BootstrapperStyleForm.SetupDialog()
|
||||||
public async Task Run()
|
public async Task Run()
|
||||||
{
|
{
|
||||||
if (App.IsQuiet)
|
|
||||||
Dialog.CloseDialog();
|
|
||||||
|
|
||||||
if (App.IsUninstall)
|
if (App.IsUninstall)
|
||||||
{
|
{
|
||||||
Uninstall();
|
Uninstall();
|
||||||
|
@ -79,9 +79,6 @@ namespace Bloxstrap.Dialogs.BootstrapperDialogs
|
|||||||
|
|
||||||
public void SetupDialog()
|
public void SetupDialog()
|
||||||
{
|
{
|
||||||
if (App.IsQuiet)
|
|
||||||
this.Hide();
|
|
||||||
|
|
||||||
this.Text = App.ProjectName;
|
this.Text = App.ProjectName;
|
||||||
this.Icon = App.Settings.BootstrapperIcon.GetIcon();
|
this.Icon = App.Settings.BootstrapperIcon.GetIcon();
|
||||||
|
|
||||||
|
@ -38,14 +38,8 @@ namespace Bloxstrap.Enums
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bootstrapper is null)
|
if (!App.IsQuiet)
|
||||||
{
|
|
||||||
dialog.ShowDialog();
|
dialog.ShowDialog();
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
Application.Run(dialog);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
{
|
{
|
||||||
"profiles": {
|
"profiles": {
|
||||||
"Bloxstrap": {
|
"Bloxstrap": {
|
||||||
"commandName": "Project",
|
"commandName": "Project"
|
||||||
"commandLineArgs": "-foo -bar"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user