Added exception handling

Author: BornToBeRoot

Source/NETworkManager/Utilities/CustomCommand.cs

@@ -1,24 +1,15 @@
-using System;
-using System.Diagnostics;
-using System.Windows;
+using System.Diagnostics;
 
 namespace NETworkManager.Utilities
 {
     public static class CustomCommand
     {
         public static void Run(CustomCommandInfo info)
         {
-            try
-            {
-                if (string.IsNullOrEmpty(info.Arguments))
-                    Process.Start(info.FilePath);
-                else
-                    Process.Start(info.FilePath, info.Arguments);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(ex.Message, "Error in Utilities.CustomCommand.Run()", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
+            if (string.IsNullOrEmpty(info.Arguments))
+                Process.Start(info.FilePath);
+            else
+                Process.Start(info.FilePath, info.Arguments);
         }
     }
 }

Source/NETworkManager/ViewModels/IPScannerViewModel.cs

@@ -372,9 +372,9 @@ private void PerformDNSLookupHostnameAction()
 
         private void CustomCommandAction(object guid)
         {
-            CustomCommand(guid);            
+            CustomCommand(guid);
         }
-                
+
         public ICommand AddProfileSelectedHostCommand => new RelayCommand(p => AddProfileSelectedHostAction());
         private async void AddProfileSelectedHostAction()
         {
@@ -590,7 +590,7 @@ private void ScanFinished()
             IsScanRunning = false;
         }
 
-        private void CustomCommand(object guid)
+        private async void CustomCommand(object guid)
         {
             if (guid is Guid id)
             {
@@ -605,10 +605,20 @@ private void CustomCommand(object guid)
 
                 info.FilePath = Regex.Replace(info.FilePath, "\\$\\$hostname\\$\\$", hostname, RegexOptions.IgnoreCase);
                 info.FilePath = Regex.Replace(info.FilePath, "\\$\\$ipaddress\\$\\$", ipAddress, RegexOptions.IgnoreCase);
-                info.Arguments = Regex.Replace(info.Arguments, "\\$\\$hostname\\$\\$", hostname, RegexOptions.IgnoreCase);
-                info.Arguments = Regex.Replace(info.Arguments, "\\$\\$ipaddress\\$\\$", ipAddress, RegexOptions.IgnoreCase);
+                if (!string.IsNullOrEmpty(info.Arguments))
+                {
+                    info.Arguments = Regex.Replace(info.Arguments, "\\$\\$hostname\\$\\$", hostname, RegexOptions.IgnoreCase);
+                    info.Arguments = Regex.Replace(info.Arguments, "\\$\\$ipaddress\\$\\$", ipAddress, RegexOptions.IgnoreCase);
+                }
 
-                Utilities.CustomCommand.Run(info);
+                try
+                {
+                    Utilities.CustomCommand.Run(info);
+                }
+                catch (Exception ex)
+                {
+                    await _dialogCoordinator.ShowMessageAsync(this, Resources.Localization.Strings.ResourceManager.GetString("Error", LocalizationManager.Culture), ex.Message, MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
+                }
             }
         }