Restart application fixed

Author: BornToBeRoot

Source/NETworkManager/MainWindow.xaml.cs

@@ -281,6 +281,14 @@ private void LoadApplicationList()
 
         private async void MetroWindowMain_Closing(object sender, CancelEventArgs e)
         {
+            // Force restart (if user has reset the settings or import them)
+            if (SettingsManager.ForceRestart || ImportExportManager.ForceRestart)
+            {
+                RestartApplication(false);
+
+                _closeApplication = true;
+            }
+
             // Hide the application to tray
             if (!_closeApplication && SettingsManager.Current.Window_MinimizeInsteadOfTerminating)
             {
@@ -657,13 +665,6 @@ private async void CloseSettingsAction()
                 MetroWindowMain.HideOverlay();
             }
 
-            // Force restart (if user has reset the settings or import them)
-            if (SettingsManager.ForceRestart || ImportExportManager.ForceRestart)
-            {
-                RestartApplication();
-                return;
-            }
-
             // Ask the user to restart (if he has changed the language)
             if ((_cultureCode != SettingsManager.Current.Localization_CultureCode) || (AllowsTransparency != SettingsManager.Current.Appearance_EnableTransparency))
             {
@@ -730,7 +731,7 @@ private void CloseApplicationAction()
             Close();
         }
 
-        private void RestartApplication()
+        private void RestartApplication(bool closeApplication = true)
         {
             new Process
             {
@@ -741,8 +742,11 @@ private void RestartApplication()
                 }
             }.Start();
 
-            _closeApplication = true;
-            Close();
+            if (closeApplication)
+            {
+                _closeApplication = true;
+                Close();
+            }
         }
 
         public ICommand TextBoxSearchCommand

Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml

@@ -60,6 +60,8 @@
     <system:String x:Key="String_Header_AddProfile">Profil hinzufügen</system:String>
     <system:String x:Key="String_Header_WakeUp">Aufwecken</system:String>
     <system:String x:Key="String_Header_AddClient">Client hinzufügen</system:String>
+    <system:String x:Key="String_Header_Libraries">Bibliotheken</system:String>
+    <system:String x:Key="String_Header_License">Lizenz</system:String>
 
     <!-- Normal strings -->
     <system:String x:Key="String_ProductName">NETworkManager</system:String>
@@ -117,7 +119,6 @@
     <system:String x:Key="String_AddTemplate">Template hinzufügen</system:String>
     <system:String x:Key="String_EnterHostnameForClient">Geben Sie den Hostnamen ein, um den Client später zu identifizieren.</system:String>
     <system:String x:Key="String_AllRightReserved">Alle Rechte vorbehalten.</system:String>
-    <system:String x:Key="String_Libraries">Bibliotheken</system:String>
     <system:String x:Key="String_Administrator">Administrator</system:String>
     <system:String x:Key="String_RestartAsAdministrator">Neustart als Administrator</system:String>
     <system:String x:Key="String_RestartAsAdministratorMessage">Zum ändern dieser Konfiguration werden administrative Rechte benötigt.</system:String>

Source/NETworkManager/Resources/Localization/Resources.en-US.xaml

@@ -60,6 +60,8 @@
     <system:String x:Key="String_Header_AddProfile">Add profile</system:String>
     <system:String x:Key="String_Header_WakeUp">Wake up</system:String>
     <system:String x:Key="String_Header_AddClient">Add client</system:String>
+    <system:String x:Key="String_Header_Libraries">Libraries</system:String>
+    <system:String x:Key="String_Header_License">License</system:String>
 
     <!-- Normal strings -->
     <system:String x:Key="String_ProductName">NETworkManager</system:String>
@@ -117,7 +119,6 @@
     <system:String x:Key="String_AddTemplate">Add template</system:String>
     <system:String x:Key="String_EnterHostnameForClient">Enter the hostname to identify the client later.</system:String>
     <system:String x:Key="String_AllRightReserved">All rights reserved.</system:String>
-    <system:String x:Key="String_Libraries">Libraries</system:String>
     <system:String x:Key="String_Administrator">Administrator</system:String>
     <system:String x:Key="String_RestartAsAdministrator">Restart as Administrator</system:String>
     <system:String x:Key="String_RestartAsAdministratorMessage">Administrative rights are required to change this configuration.</system:String>

Source/NETworkManager/Views/Settings/AboutView.xaml

@@ -21,8 +21,8 @@
                 <TextBlock Text="{DynamicResource String_AllRightReserved}" Style="{StaticResource DefaultTextBlock}" />
             </StackPanel>
         </Grid>
-        <TextBlock Text="{DynamicResource String_Libraries}" Style="{StaticResource HeaderTextBlock}"/>
-        <Grid>
+        <TextBlock Text="{DynamicResource String_Header_Libraries}" Style="{StaticResource HeaderTextBlock}"/>
+        <Grid Margin="0,0,0,20">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="10" />
@@ -62,5 +62,6 @@
             </TextBlock>
             <TextBlock Grid.Column="2" Grid.Row="6" Text="{DynamicResource String_Libary_HeijdenDNSDescription}" Style="{StaticResource WrapTextBlock}" />
         </Grid>
+        <TextBlock Text="{DynamicResource String_Header_License}" Style="{StaticResource HeaderTextBlock}"/>
     </StackPanel>
 </UserControl>