Merge pull request #707 from skadefro/master

move plugin loading, add try catch
open-rpa · Oct 10, 2022 · e85d625 · e85d625
2 parents 398874b + 5c7b3d9
commit e85d625
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 28 deletions.
diff --git a/OpenRPA.MSSpeech/OpenRPA.MSSpeech.csproj b/OpenRPA.MSSpeech/OpenRPA.MSSpeech.csproj
@@ -42,6 +42,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRPA.Interfaces\OpenRPA.Interfaces.csproj" />
+    <ProjectReference Include="..\OpenRPA.NamedPipeWrapper\OpenRPA.NamedPipeWrapper.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Activities" />

diff --git a/OpenRPA/App.xaml.cs b/OpenRPA/App.xaml.cs
@@ -199,55 +199,66 @@ public bool SignalExternalCommandLineArgs(IList<string> args)
         }
         private async void Application_Startup(object sender, StartupEventArgs e)
         {
-            AutomationHelper.syncContext = System.Threading.SynchronizationContext.Current;
-            System.Threading.Thread.CurrentThread.Name = "UIThread";
-            if (!Config.local.isagent)
-            {
-                StartupUri = new Uri("/OpenRPA;component/MainWindow.xaml", UriKind.Relative);
-                notifyIcon.Visible = true;
-            }
-            else
-            {
-                StartupUri = new Uri("/OpenRPA;component/AgentWindow.xaml", UriKind.Relative);
-                notifyIcon.Visible = true;
-            }
-            if (Config.local.files_pending_deletion.Length > 0)
+            try
             {
-                bool sucess = true;
-                foreach (var f in Config.local.files_pending_deletion)
+                AutomationHelper.syncContext = System.Threading.SynchronizationContext.Current;
+                System.Threading.Thread.CurrentThread.Name = "UIThread";
+                if (!Config.local.isagent)
                 {
-                    try
+                    StartupUri = new Uri("/OpenRPA;component/MainWindow.xaml", UriKind.Relative);
+                    notifyIcon.Visible = true;
+                }
+                else
+                {
+                    StartupUri = new Uri("/OpenRPA;component/AgentWindow.xaml", UriKind.Relative);
+                    notifyIcon.Visible = true;
+                }
+                if (Config.local.files_pending_deletion.Length > 0)
+                {
+                    bool sucess = true;
+                    foreach (var f in Config.local.files_pending_deletion)
                     {
-                        if (System.IO.File.Exists(f)) System.IO.File.Delete(f);
+                        try
+                        {
+                            if (System.IO.File.Exists(f)) System.IO.File.Delete(f);
+                        }
+                        catch (Exception ex)
+                        {
+                            sucess = false;
+                            Log.Error(ex.ToString());
+                        }
                     }
-                    catch (Exception ex)
+                    if (sucess)
                     {
-                        sucess = false;
-                        Log.Error(ex.ToString());
+                        Config.local.files_pending_deletion = new string[] { };
+                        Config.Save();
                     }
                 }
-                if (sucess)
-                {
-                    Config.local.files_pending_deletion = new string[] { };
-                    Config.Save();
-                }
+                RobotInstance.instance.Status += App_Status;
+                Input.InputDriver.Instance.initCancelKey(Config.local.cancelkey);
+                Plugins.LoadPlugins(RobotInstance.instance, Interfaces.Extensions.PluginsDirectory, false);
             }
-            RobotInstance.instance.Status += App_Status;
-            Input.InputDriver.Instance.initCancelKey(Config.local.cancelkey);
+            catch (Exception ex)
+            {
+                Log.Error(ex.ToString());
+                Console.WriteLine(ex.ToString());
+                MessageBox.Show(ex.Message);
+            }
+
             await Task.Run(async () =>
             {
                 try
                 {
                     // if (Config.local.showloadingscreen) splash.BusyContent = "loading plugins";
                     // Plugins.LoadPlugins(RobotInstance.instance, Interfaces.Extensions.ProjectsDirectory);
-                    Plugins.LoadPlugins(RobotInstance.instance, Interfaces.Extensions.PluginsDirectory, false);
                     // if (Config.local.showloadingscreen) splash.BusyContent = "Initialize main window";
                     await RobotInstance.instance.init();
                 }
                 catch (Exception ex)
                 {
                     Log.Error(ex.ToString());
                     Console.WriteLine(ex.ToString());
+                    MessageBox.Show(ex.Message);
                 }
             });
         }