From 74cadd74ef4dea46124339339b86a35db02ce09b Mon Sep 17 00:00:00 2001
From: Sleevezipper <maurits.hopma@gmail.com>
Date: Sun, 12 Dec 2021 16:09:18 +0100
Subject: [PATCH] Provide a clearer error message when the service isn't
 running

---
 UserInterface/Views/BackgroundServiceSettings.axaml | 5 +----
 UserInterface/Views/BrokerSettings.axaml            | 2 +-
 UserInterface/Views/MainWindow.axaml                | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/UserInterface/Views/BackgroundServiceSettings.axaml b/UserInterface/Views/BackgroundServiceSettings.axaml
index 4b7baed..eadbee8 100644
--- a/UserInterface/Views/BackgroundServiceSettings.axaml
+++ b/UserInterface/Views/BackgroundServiceSettings.axaml
@@ -9,10 +9,7 @@
       <ContentControl FontSize="18" FontWeight="Bold">Background service</ContentControl>
       <TextBlock IsVisible="{Binding IsRunning}" Foreground="Green" Text="{Binding Message}"></TextBlock >
       <TextBlock IsVisible="{Binding !IsRunning}" Foreground="Red" Text="{Binding Message}"></TextBlock >
-
-      <Button IsVisible="{Binding !IsRunning}" Width="75" HorizontalAlignment="Right" Margin="0 40 0 10" Click="Start">Start</Button>
-
-
+      <TextBlock TextWrapping="Wrap" IsVisible="{Binding !IsRunning}" Text="The UI will crash after a while if the service wasn't started first. Please make sure the service is running. If you used the installer and you are seeing this message, please check if your antivirus might be interfering. "></TextBlock >
     </StackPanel>
     <StackPanel HorizontalAlignment="Stretch">
       <ContentControl FontSize="14" FontWeight="Bold">Autostart</ContentControl>
diff --git a/UserInterface/Views/BrokerSettings.axaml b/UserInterface/Views/BrokerSettings.axaml
index d583039..b23b798 100644
--- a/UserInterface/Views/BrokerSettings.axaml
+++ b/UserInterface/Views/BrokerSettings.axaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="UserInterface.Views.BrokerSettings">
-  <StackPanel Margin="30" HorizontalAlignment="Left">
+  <StackPanel Margin="30" HorizontalAlignment="Left" ScrollViewer.VerticalScrollBarVisibility="Auto">
     <ContentControl FontSize="18" FontWeight="Bold">MQTT Broker</ContentControl>
     <TextBlock IsVisible="{Binding IsConnected}" Foreground="Green" Text="{Binding Message}"></TextBlock >
     <TextBlock IsVisible="{Binding !IsConnected}" Foreground="Red" Text="{Binding Message}"></TextBlock >
diff --git a/UserInterface/Views/MainWindow.axaml b/UserInterface/Views/MainWindow.axaml
index f9beaca..31d7da7 100644
--- a/UserInterface/Views/MainWindow.axaml
+++ b/UserInterface/Views/MainWindow.axaml
@@ -27,5 +27,4 @@
         <views:BackgroundServiceSettings Grid.Column="2" Grid.Row="0" Margin="10" Background="#2D2D30"/>
         <views:AppInfo Grid.Column="2" Grid.Row="1" Margin="10" Background="#2D2D30"/>
     </Grid>
-
 </Window>
\ No newline at end of file