Merge branch 'develop' into try-refactor-to-page

2020-10-14 08:42:53 +02:00
parent 073aa8c79a 87e199d1b5
commit fd4fcd0e51
7 changed files with 61 additions and 20 deletions
--- a/ClientApp/Views/MainView.xaml
+++ b/ClientApp/Views/MainView.xaml
@@ -40,7 +40,7 @@
                </Button.Content>
            </Button>

-            <Button Grid.Column="1" Grid.Row="1"  Command="{Binding RetryVREngineCommand}" Width="50" Height="20">
+            <Button Grid.Column="1" Grid.Row="1"  Command="{Binding RetryVREngineCommand}" Width="50" Height="20" IsEnabled="{Binding MainWindowViewModel.InfoModel.CanConnectToVR}">
                <Button.Content>
                    <TextBlock TextWrapping="Wrap" Text="retry"/>
                </Button.Content>