Machine Studio, Dynamic Module Loading...

1 files changed, 2 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.SharedUI/Helpers/ResourceHelper.cs b/Software/Visual_Studio/Tango.SharedUI/Helpers/ResourceHelper.cs
index 24ce62620..c3c0f274e 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Helpers/ResourceHelper.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Helpers/ResourceHelper.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
@@ -16,7 +17,7 @@ namespace Tango.SharedUI.Helpers
 
         public static BitmapSource GetImageFromResources(String imagePath)
         {
-            return new BitmapImage(new Uri(String.Format("pack://application:,,,/{0};component/{1}", typeof(ResourceHelper).Assembly, imagePath), UriKind.Absolute));
+            return new BitmapImage(new Uri(String.Format("pack://application:,,,/{0};component/{1}", Assembly.GetCallingAssembly(), imagePath), UriKind.Absolute));
         }
     }
 }