- Attempted fix for SteamCMD string exception
- Attempted fix for weird ExceptionHandler behavior
- Fixed weird "Block Protected Games" checkbox sizing for other languages
This commit is contained in:
pointfeev 2022-05-08 17:10:58 -04:00
parent dd4be5b91f
commit 53af12fdae
4 changed files with 13 additions and 11 deletions

View file

@ -5,7 +5,7 @@
<UseWindowsForms>True</UseWindowsForms> <UseWindowsForms>True</UseWindowsForms>
<ApplicationIcon>Resources\ini.ico</ApplicationIcon> <ApplicationIcon>Resources\ini.ico</ApplicationIcon>
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract> <IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
<Version>3.4.3.0</Version> <Version>3.4.3.1</Version>
<PackageIcon>Resources\ini.ico</PackageIcon> <PackageIcon>Resources\ini.ico</PackageIcon>
<PackageLicenseFile>LICENSE</PackageLicenseFile> <PackageLicenseFile>LICENSE</PackageLicenseFile>
<Copyright>2021, pointfeev (https://github.com/pointfeev)</Copyright> <Copyright>2021, pointfeev (https://github.com/pointfeev)</Copyright>

View file

@ -109,7 +109,8 @@ namespace CreamInstaller
this.noneFoundLabel.Name = "noneFoundLabel"; this.noneFoundLabel.Name = "noneFoundLabel";
this.noneFoundLabel.Size = new System.Drawing.Size(554, 218); this.noneFoundLabel.Size = new System.Drawing.Size(554, 218);
this.noneFoundLabel.TabIndex = 1002; this.noneFoundLabel.TabIndex = 1002;
this.noneFoundLabel.Text = "No CreamAPI-applicable or ScreamAPI-applicable programs were found on your computer!"; this.noneFoundLabel.Text = "No CreamAPI-applicable or ScreamAPI-applicable programs were found on your comput" +
"er!";
this.noneFoundLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.noneFoundLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.noneFoundLabel.Visible = false; this.noneFoundLabel.Visible = false;
// //
@ -123,12 +124,12 @@ namespace CreamInstaller
this.flowLayoutPanel1.Location = new System.Drawing.Point(224, -1); this.flowLayoutPanel1.Location = new System.Drawing.Point(224, -1);
this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Name = "flowLayoutPanel1";
this.flowLayoutPanel1.Size = new System.Drawing.Size(165, 19); this.flowLayoutPanel1.Size = new System.Drawing.Size(179, 20);
this.flowLayoutPanel1.TabIndex = 1005; this.flowLayoutPanel1.TabIndex = 1005;
// //
// blockedGamesCheckBox // blockedGamesCheckBox
// //
this.blockedGamesCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.blockedGamesCheckBox.AutoSize = true;
this.blockedGamesCheckBox.Checked = true; this.blockedGamesCheckBox.Checked = true;
this.blockedGamesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked; this.blockedGamesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
this.blockedGamesCheckBox.Enabled = false; this.blockedGamesCheckBox.Enabled = false;
@ -136,7 +137,7 @@ namespace CreamInstaller
this.blockedGamesCheckBox.Location = new System.Drawing.Point(3, 0); this.blockedGamesCheckBox.Location = new System.Drawing.Point(3, 0);
this.blockedGamesCheckBox.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.blockedGamesCheckBox.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
this.blockedGamesCheckBox.Name = "blockedGamesCheckBox"; this.blockedGamesCheckBox.Name = "blockedGamesCheckBox";
this.blockedGamesCheckBox.Size = new System.Drawing.Size(140, 19); this.blockedGamesCheckBox.Size = new System.Drawing.Size(154, 20);
this.blockedGamesCheckBox.TabIndex = 1003; this.blockedGamesCheckBox.TabIndex = 1003;
this.blockedGamesCheckBox.Text = "Block Protected Games"; this.blockedGamesCheckBox.Text = "Block Protected Games";
this.blockedGamesCheckBox.UseVisualStyleBackColor = true; this.blockedGamesCheckBox.UseVisualStyleBackColor = true;
@ -147,7 +148,7 @@ namespace CreamInstaller
this.blockProtectedHelpButton.Enabled = false; this.blockProtectedHelpButton.Enabled = false;
this.blockProtectedHelpButton.FlatStyle = System.Windows.Forms.FlatStyle.System; this.blockProtectedHelpButton.FlatStyle = System.Windows.Forms.FlatStyle.System;
this.blockProtectedHelpButton.Font = new System.Drawing.Font("Segoe UI", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); this.blockProtectedHelpButton.Font = new System.Drawing.Font("Segoe UI", 7F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
this.blockProtectedHelpButton.Location = new System.Drawing.Point(143, 0); this.blockProtectedHelpButton.Location = new System.Drawing.Point(157, 0);
this.blockProtectedHelpButton.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); this.blockProtectedHelpButton.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
this.blockProtectedHelpButton.Name = "blockProtectedHelpButton"; this.blockProtectedHelpButton.Name = "blockProtectedHelpButton";
this.blockProtectedHelpButton.Size = new System.Drawing.Size(19, 19); this.blockProtectedHelpButton.Size = new System.Drawing.Size(19, 19);
@ -293,6 +294,7 @@ namespace CreamInstaller
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout(); this.groupBox1.PerformLayout();
this.flowLayoutPanel1.ResumeLayout(false); this.flowLayoutPanel1.ResumeLayout(false);
this.flowLayoutPanel1.PerformLayout();
this.flowLayoutPanel2.ResumeLayout(false); this.flowLayoutPanel2.ResumeLayout(false);
this.ResumeLayout(false); this.ResumeLayout(false);

View file

@ -107,7 +107,7 @@ internal static class SteamCMD
} }
} }
Interlocked.Decrement(ref locks[i]); Interlocked.Decrement(ref locks[i]);
return appInfo; return appInfo ?? "";
} }
Thread.Sleep(200); Thread.Sleep(200);
} }
@ -221,10 +221,10 @@ internal static class SteamCMD
if (File.Exists(appUpdateFile)) output = File.ReadAllText(appUpdateFile, Encoding.UTF8); if (File.Exists(appUpdateFile)) output = File.ReadAllText(appUpdateFile, Encoding.UTF8);
else else
{ {
output = await Run(appId); output = await Run(appId) ?? "";
int openBracket = output.IndexOf("{"); int openBracket = output.IndexOf("{");
int closeBracket = output.LastIndexOf("}"); int closeBracket = output.LastIndexOf("}");
if (openBracket != -1 && closeBracket != -1) if (!string.IsNullOrEmpty(output) && openBracket != -1 && closeBracket != -1)
{ {
output = $"\"{appId}\"\n" + output[openBracket..(1 + closeBracket)]; output = $"\"{appId}\"\n" + output[openBracket..(1 + closeBracket)];
output = output.Replace("ERROR! Failed to install app '4' (Invalid platform)", ""); output = output.Replace("ERROR! Failed to install app '4' (Invalid platform)", "");

View file

@ -18,8 +18,8 @@ internal static class ExceptionHandler
for (int i = 0; i < Math.Min(stackTrace.Length, 3); i++) for (int i = 0; i < Math.Min(stackTrace.Length, 3); i++)
{ {
string line = stackTrace[i]; string line = stackTrace[i];
int atNum = line.IndexOf("at "); int atNum = line.LastIndexOf("at ");
int inNum = line.IndexOf("in "); int inNum = line.LastIndexOf("in ");
int ciNum = line.LastIndexOf(@"CreamInstaller\"); int ciNum = line.LastIndexOf(@"CreamInstaller\");
int lineNum = line.LastIndexOf(":line "); int lineNum = line.LastIndexOf(":line ");
if (line is not null && atNum != -1) if (line is not null && atNum != -1)