Fix for crash

ME3Tweaks · Dec 25, 2017 · 52d2a1b · 52d2a1b
1 parent 21fd6ce
commit 52d2a1b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/AlotAddOnGUI/MainWindow.xaml.cs b/AlotAddOnGUI/MainWindow.xaml.cs
@@ -1361,7 +1361,7 @@ private void ShowBuildOptions(int game)
             ALOTVersionInfo installedInfo = Utilities.GetInstalledALOTInfo(game);
             bool alotInstalled = installedInfo != null; //default value
             int installedALOTUpdateVersion = (installedInfo == null) ? 0 : installedInfo.ALOTUPDATEVER;
-            if (installedInfo != null || installedInfo.ALOTVER == 0) //not installed or mem installed
+            if (installedInfo == null || installedInfo.ALOTVER == 0) //not installed or mem installed
             {
                 Checkbox_BuildOptionAddon.IsChecked = true;
                 Checkbox_BuildOptionAddon.IsEnabled = false;

diff --git a/AlotAddOnGUI/Properties/AssemblyInfo.cs b/AlotAddOnGUI/Properties/AssemblyInfo.cs
@@ -17,7 +17,7 @@
 [assembly: AssemblyCulture("")]
 
 // Version informationr(
-[assembly: AssemblyVersion("2.0.124.1386")]
-[assembly: AssemblyFileVersion("2.0.124.1386")]
+[assembly: AssemblyVersion("2.0.127.1389")]
+[assembly: AssemblyFileVersion("2.0.127.1389")]
 [assembly: NeutralResourcesLanguageAttribute( "en-US" )]
 
diff --git a/ReleaseBuilder.ps1 b/ReleaseBuilder.ps1
@@ -11,14 +11,25 @@ if (Test-Path "$($PSScriptRoot)\Release\lib\ALOTinstaller.pdb") {
 
 if (Test-Path "$($PSScriptRoot)\Release\ALOTAddonBuilder.exe") {
     Write-Host Removing current ALOTAddonBuilder...
-    Remove-Item "$($PSScriptRoot)\Release\logs" -Force
+    Remove-Item "$($PSScriptRoot)\Release\ALOTAddonBuilder.exe" -Force
+}
+
+if (Test-Path "$($PSScriptRoot)\Release\manifest-bundled.xml") {
+    Write-Host Removing current manifest bundle...
+    Remove-Item "$($PSScriptRoot)\Release\manifest-bundled.xml" -Force
+}
+
+if (Test-Path "$($PSScriptRoot)\Release\manifest.xml") {
+    Write-Host Bundling current manifest...
+    Move-Item "$($PSScriptRoot)\Release\manifest.xml" -Destination "$($PSScriptRoot)\Release\manifest-bundled.xml"
 }
 
 if (Test-Path "$($PSScriptRoot)\..\..\update-backcompat\ALOTAddonBuilder.exe") {
     Write-Host Adding ALOTAddonBuilder.exe for update backwards compatibility...
     Copy-Item "$($PSScriptRoot)\..\..\update-backcompat\ALOTAddonBuilder.exe" "$($PSScriptRoot)\Release\ALOTAddonBuilder.exe" -Force
 }
 
+
 $fileversion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("Release\ALOTinstaller.exe").FileVersion
 $outputfile = "$($PSScriptRoot)\ALOTinstaller_$($fileversion).7z"
 $exe = "$($PSScriptRoot)\Release\bin\7z.exe"