From fea4547613d57f8fcc8cb94671c54d82a5b11dbb Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Fri, 13 Dec 2019 00:23:55 +0200
Subject: Added browser cef loading error support. Implemented better module
 loading error handling in general.

---
 .../Visual_Studio/PPC/Modules/Tango.PPC.Browser/BrowserModule.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/BrowserModule.cs')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/BrowserModule.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/BrowserModule.cs
index cd8372277..dc7b294d5 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/BrowserModule.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Browser/BrowserModule.cs
@@ -10,6 +10,8 @@ using Tango.PPC.Browser.Views;
 using Tango.SharedUI.Helpers;
 using Tango.Core.DI;
 using Tango.PPC.Common.Application;
+using System.IO;
+using Tango.Core.Helpers;
 
 namespace Tango.PPC.Browser
 {
@@ -68,7 +70,7 @@ namespace Tango.PPC.Browser
         {
             get
             {
-                return typeof(BrowserView);
+                return IsCefAvailable() ? typeof(BrowserView) : typeof(ErrorView);
             }
         }
 
@@ -83,6 +85,11 @@ namespace Tango.PPC.Browser
             }
         }
 
+        private bool IsCefAvailable()
+        {
+            return File.Exists(Path.Combine(AssemblyHelper.GetCurrentAssemblyFolder(), "x86", "CefSharp.Core.dll"));
+        }
+
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
-- 
cgit v1.3.1