Show error state in Update window, make Build.ps1 work even though Se…

…tup.exe is not copied.
christianrondeau · Sep 28, 2014 · 28a2260 · 28a2260
1 parent f18a7f0
commit 28a2260
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Build.ps1 b/Build.ps1
@@ -88,7 +88,11 @@ If(Test-Path -Path $OutputSetupExe) {
 }
 
 &($Squirrel) -g $SetupLoadingGif --releasify $NuPkgPath
-Rename-Item "$ReleasesFolder\Setup.exe" $OutputSetupExe
+
+$SquirrelSetupExe = "$ReleasesFolder\Setup.exe"
+If(Test-Path -Path $SquirrelSetupExe) {
+	Rename-Item $SquirrelSetupExe $OutputSetupExe
+}
 
 # ==================================== Cleanup
 

diff --git a/GoToWindow/ViewModels/UpdateViewModel.cs b/GoToWindow/ViewModels/UpdateViewModel.cs
@@ -57,7 +57,8 @@ private void UpdateCallback(UpdateStatus updateStatus, int progress)
 		}
 
 		private void UpdateErrorCallback(Exception exc)
-		{
+        {
+			UpdateStatus = UpdateStatus.Error;
 			Enabled = true;
 		}
 	}

diff --git a/GoToWindow/Windows/UpdateWindow.xaml b/GoToWindow/Windows/UpdateWindow.xaml
@@ -42,7 +42,7 @@
 			<ProgressBar Height="24" Maximum="100" Value="20" Margin="0,8,0,8"></ProgressBar>
 
 			<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-				<Button Content="_Close" IsEnabled="{Binding Enabled}" Click="Button_Click" />
+				<Button Content="_Close" IsEnabled="{Binding Enabled}" Click="Button_Click" Padding="4" />
 			</StackPanel>
 		</StackPanel>
 	</Grid>
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     		private void UpdateErrorCallback(Exception exc)
-    		{
+            {
+    			UpdateStatus = UpdateStatus.Error;
     			Enabled = true;
     		}
     	}
@@ Expand Down @@