Skip to content

Commit deac960

Browse files
Fix Bug - Placement of Splash Screen and disposing presense
1 parent a4590bc commit deac960

File tree

6 files changed

+1943
-1931
lines changed

6 files changed

+1943
-1931
lines changed

.vs/OneClickZip/v16/.suo

69 KB
Binary file not shown.

Forms/Options/OneClickProcessorFrm.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public OneClickProcessorFrm()
4040
}
4141
private void OneClickProcessor_Load(object sender, EventArgs e)
4242
{
43+
SplashScreenDesignerFrm.GetIntance().DisposeInstance();
4344
lblElapsedTime.Text = "00:00:00";
4445
lblFilesAdded.Text = "0% > 0";
4546
lblFoldersCreated.Text = "0% > 0";

Forms/ZipDesigner/ZipDesignerFrm.Designer.cs

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

Forms/ZipDesigner/ZipDesignerFrm.resx

Lines changed: 1785 additions & 1779 deletions
Large diffs are not rendered by default.

OneClickZip.sln

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,22 @@ VisualStudioVersion = 16.0.30503.244
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OneClickZip", "OneClickZip.csproj", "{90D4470D-DC6F-477C-9948-D97E121BF304}"
77
EndProject
8+
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "OneClickZipSetup", "..\OneClickZipSetup\OneClickZipSetup.vdproj", "{D2039030-7F4D-4105-ADF8-688C4B6ABC84}"
9+
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1012
Debug|Any CPU = Debug|Any CPU
1113
Release|Any CPU = Release|Any CPU
1214
EndGlobalSection
1315
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{90D4470D-DC6F-477C-9948-D97E121BF304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{90D4470D-DC6F-477C-9948-D97E121BF304}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{90D4470D-DC6F-477C-9948-D97E121BF304}.Debug|Any CPU.ActiveCfg = Release|Any CPU
17+
{90D4470D-DC6F-477C-9948-D97E121BF304}.Debug|Any CPU.Build.0 = Release|Any CPU
1618
{90D4470D-DC6F-477C-9948-D97E121BF304}.Release|Any CPU.ActiveCfg = Release|Any CPU
1719
{90D4470D-DC6F-477C-9948-D97E121BF304}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{D2039030-7F4D-4105-ADF8-688C4B6ABC84}.Debug|Any CPU.ActiveCfg = Release
21+
{D2039030-7F4D-4105-ADF8-688C4B6ABC84}.Debug|Any CPU.Build.0 = Release
22+
{D2039030-7F4D-4105-ADF8-688C4B6ABC84}.Release|Any CPU.ActiveCfg = Release
23+
{D2039030-7F4D-4105-ADF8-688C4B6ABC84}.Release|Any CPU.Build.0 = Release
1824
EndGlobalSection
1925
GlobalSection(SolutionProperties) = preSolution
2026
HideSolutionNode = FALSE

Program.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ static void Main(string[] args)
2121

2222
ApplicationArgumentModel applicationArgumentModel = new ApplicationArgumentModel(args);
2323
ProjectSession.Instance().ApplicationArgumentModel = applicationArgumentModel;
24-
2524
if (applicationArgumentModel.IsOpenProjectBatchFile)
2625
{
27-
SplashScreenDesignerFrm.GetIntance().Show();
2826
Application.Run(new OneClickProcessorFrm());
2927
}
3028
else
3129
{
30+
SplashScreenDesignerFrm.GetIntance().Show();
3231
Application.Run(new ZipDesigner());
3332
}
3433
}

0 commit comments

Comments
 (0)