Skip to content

Commit 0a4ec34

Browse files
committed
v1.4.1 hotfix commit
1 parent 93a8c2d commit 0a4ec34

26 files changed

+327
-58
lines changed
-89.6 KB
Binary file not shown.
-90.1 KB
Binary file not shown.
710 Bytes
Binary file not shown.

Advanced Installer/Advanced Installer.aip

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
<ROW Property="BannerBitmap" Value="banner" MultiBuildValue="DefaultBuild:banner.png" Type="1" MsiKey="BannerBitmap"/>
4141
<ROW Property="DialogBitmap" Value="dialog" MultiBuildValue="DefaultBuild:dialogbitmap.png" Type="1" MsiKey="DialogBitmap"/>
4242
<ROW Property="Manufacturer" Value="Albert MN."/>
43-
<ROW Property="ProductCode" Value="1033:{9178F274-C56D-4B98-B32A-B23F434751B3} " Type="16"/>
43+
<ROW Property="ProductCode" Value="1033:{2B851F35-BAC2-4535-8A0D-DA3B6D3FAB7C} " Type="16"/>
4444
<ROW Property="ProductLanguage" Value="1033"/>
4545
<ROW Property="ProductName" Value="AssistantComputerControl"/>
46-
<ROW Property="ProductVersion" Value="1.3.9" Type="32"/>
46+
<ROW Property="ProductVersion" Value="1.4.1" Type="32"/>
4747
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
4848
<ROW Property="UpgradeCode" Value="{8E6F4399-B513-420B-8E11-36837A8550EE}"/>
4949
<ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -132,6 +132,8 @@
132132
<ROW File="jquery.js" Component_="getting_started_scripts.js" FileName="jquery.js" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\js\jquery.js" SelfReg="false"/>
133133
<ROW File="popper.min.js" Component_="getting_started_scripts.js" FileName="POPPER~1.JS|popper.min.js" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\js\popper.min.js" SelfReg="false"/>
134134
<ROW File="sweetalert2.min.js" Component_="getting_started_scripts.js" FileName="SWEETA~1.JS|sweetalert2.min.js" Attributes="0" SourcePath="..\AssistantComputerControl\WebFiles\assets\js\sweetalert2.min.js" SelfReg="false"/>
135+
<ROW File="Francais.json" Component_="Danish.json" FileName="FRANCA~1.JSO|Francais.json" Attributes="0" SourcePath="..\AssistantComputerControl\Translations\Francais.json" SelfReg="false"/>
136+
<ROW File="Italian.json" Component_="Danish.json" FileName="ITALIA~1.JSO|Italian.json" Attributes="0" SourcePath="..\AssistantComputerControl\Translations\Italian.json" SelfReg="false"/>
135137
</COMPONENT>
136138
<COMPONENT cid="caphyon.advinst.msicomp.AppPathsComponent">
137139
<ROW Name="AI_APPPATH_PERBUILD_AssistantComputerControl.exe" Path="[|AI_PROPPATH_DIR_PERBUILD_AssistantComputerControl.exe]\[|AI_PROPPATH_FILENAME_PERBUILD_AssistantComputerControl.exe]" Type="2" Content="0"/>

AssistantComputerControl/Actions.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@ public void Open(string parameter) {
394394
string combinedPath = "";
395395
try {
396396
combinedPath = Path.Combine(MainProgram.shortcutLocation, location);
397+
//MainProgram.DoDebug();
397398
} catch {
398399
Error("Given path (" + location+ ") is invalid (could not combine)");
399400
}
@@ -404,7 +405,8 @@ public void Open(string parameter) {
404405
}
405406

406407
if (fileLocation != "") {
407-
if (MainProgram.IsValidPath(location)) {
408+
MainProgram.DoDebug(fileLocation);
409+
try {
408410
if (File.Exists(fileLocation) || Directory.Exists(fileLocation) || Uri.IsWellFormedUriString(fileLocation, UriKind.Absolute)) {
409411
if (!MainProgram.testingAction) {
410412
try {
@@ -424,8 +426,8 @@ public void Open(string parameter) {
424426
} else {
425427
Error("File or directory doesn't exist (" + fileLocation + ")");
426428
}
427-
} else {
428-
Error("Given path is invalid");
429+
} catch {
430+
MainProgram.DoDebug("Error when opening file");
429431
}
430432
}
431433
}

AssistantComputerControl/AssistantComputerControl.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<CreateWebPageOnPublish>true</CreateWebPageOnPublish>
3636
<WebPage>publish.htm</WebPage>
3737
<ApplicationRevision>0</ApplicationRevision>
38-
<ApplicationVersion>1.4.0.%2a</ApplicationVersion>
38+
<ApplicationVersion>1.4.1.%2a</ApplicationVersion>
3939
<UseApplicationTrust>false</UseApplicationTrust>
4040
<CreateDesktopShortcut>true</CreateDesktopShortcut>
4141
<PublishWizardCompleted>true</PublishWizardCompleted>
@@ -232,6 +232,7 @@
232232
<None Include="Translations\Francais.json">
233233
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
234234
</None>
235+
<None Include="Translations\Italian.json" />
235236
</ItemGroup>
236237
<ItemGroup>
237238
<None Include="Resources\logo_white.ico" />

AssistantComputerControl/CleanupService.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ void ExtraCleanup() {
6969

7070
Process p = new Process();
7171
p.StartInfo.FileName = "powershell.exe";
72-
p.StartInfo.Arguments = $"-file \"{ps1File}\" \"{Path.Combine(MainProgram.CheckPath(), "*")}\" \"*.{Properties.Settings.Default.ActionFileExtension}\"";
72+
p.StartInfo.Arguments = $"-WindowStyle Hidden -file \"{ps1File}\" \"{Path.Combine(MainProgram.CheckPath(), "*")}\" \"*.{Properties.Settings.Default.ActionFileExtension}\"";
7373
p.StartInfo.UseShellExecute = false;
74+
p.StartInfo.CreateNoWindow = true;
7475
p.Start();
7576
} catch {
7677
MainProgram.DoDebug("[CLEANUP] Extra checkup failed");

0 commit comments

Comments
 (0)