Skip to content

Commit 369619c

Browse files
Rename 'Exit' button to Logout and fix app crashing on clicking stop assessment button (#124)
1 parent c74e4d9 commit 369619c

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<SymbolIcon Symbol="Document"/>
115115
</NavigationViewItem.Icon>
116116
</NavigationViewItem>
117-
<NavigationViewItem Style="{StaticResource NavigationViewItemStyle}" Content="Exit" Tag="Close" x:Name="BottomDockCloseButton">
117+
<NavigationViewItem Style="{StaticResource NavigationViewItemStyle}" Content="Logout" Tag="Close" x:Name="BottomDockCloseButton" Tapped="BottomDockCloseButton_Tapped">
118118
<NavigationViewItem.Icon>
119119
<SymbolIcon Symbol="ClosePane"/>
120120
</NavigationViewItem.Icon>

src/MainWindow.xaml.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ private async Task<bool> DisplayAlert(string title, string content, string prima
672672
var result = await dialog.ShowAsync();
673673
if(result == ContentDialogResult.Primary)
674674
{
675-
Application.Current.Exit();
675+
return result == ContentDialogResult.Primary;
676676
}
677677
return result == ContentDialogResult.Secondary;
678678
}
@@ -1524,6 +1524,11 @@ private void HelperDocButton_Tapped(object sender, TappedRoutedEventArgs e)
15241524
var success = Windows.System.Launcher.LaunchUriAsync(uri);
15251525
}
15261526

1527+
private void BottomDockCloseButton_Tapped(object sender, TappedRoutedEventArgs e)
1528+
{
1529+
CloseForm();
1530+
}
1531+
15271532
public void SetHasImportInventory(bool hasImportInventory)
15281533
{
15291534
HasImportInventory = hasImportInventory;

0 commit comments

Comments
 (0)