Merge pull request PintaProject#118 from codeprof/patch-3

prevent inlining, as this would change the result of GetExecutingAssembly()
krvax · Apr 13, 2016 · ab86ea7 · ab86ea7
2 parents 2861d3e + fc7754a
commit ab86ea7
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Pinta.Resources/ResourceManager.cs b/Pinta.Resources/ResourceManager.cs
@@ -28,6 +28,7 @@
 using System.IO;
 using Gdk;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 namespace Pinta.Resources
 {
@@ -44,6 +45,7 @@ private static bool HasResource(Assembly asm, string name)
 				return false;
 		}
 
+		[MethodImpl(MethodImplOptions.NoInlining)]
 		public static Pixbuf GetIcon (string name, int size)
 		{
 			Gdk.Pixbuf result = null;