From 6459dd2bf36ffb39935105c8d6d2a93c550ee4c3 Mon Sep 17 00:00:00 2001
From: RKrom <robin@getgreenshot.org>
Date: Tue, 22 May 2012 04:48:08 +0000
Subject: [PATCH] Trying to see if LoadFrom is more stable than LoadFile, this
 is discussed in many blogs.. also fixed a file reference in the project.

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1893 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
---
 Greenshot/Greenshot.csproj                     | 2 +-
 Greenshot/Helpers/PluginHelper.cs              | 2 +-
 Greenshot/releases/additional_files/readme.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj
index ed93d9803..52e5d594b 100644
--- a/Greenshot/Greenshot.csproj
+++ b/Greenshot/Greenshot.csproj
@@ -361,7 +361,7 @@
     <None Include="Languages\language-sk-SK.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Languages\language-sr-SR.xml">
+    <None Include="Languages\language-sr-RS.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="Languages\language-sv-SE.xml">
diff --git a/Greenshot/Helpers/PluginHelper.cs b/Greenshot/Helpers/PluginHelper.cs
index 52d8e54ac..c47e7d527 100644
--- a/Greenshot/Helpers/PluginHelper.cs
+++ b/Greenshot/Helpers/PluginHelper.cs
@@ -229,7 +229,7 @@ namespace Greenshot.Helpers {
 			foreach (string pluginFile in pluginFiles) {
 				LOG.DebugFormat("Checking the following file for plugins: {0}", pluginFile);
 				try {
-					Assembly assembly = Assembly.LoadFile(pluginFile, Assembly.GetExecutingAssembly().Evidence);
+					Assembly assembly = Assembly.LoadFrom(pluginFile, Assembly.GetExecutingAssembly().Evidence);
 					PluginAttribute[] pluginAttributes = assembly.GetCustomAttributes(typeof(PluginAttribute), false) as PluginAttribute[];
 					if (pluginAttributes.Length > 0) {
 						PluginAttribute pluginAttribute = pluginAttributes[0];
diff --git a/Greenshot/releases/additional_files/readme.txt b/Greenshot/releases/additional_files/readme.txt
index 02717c0d7..27f9cdb08 100644
--- a/Greenshot/releases/additional_files/readme.txt
+++ b/Greenshot/releases/additional_files/readme.txt
@@ -3,7 +3,7 @@ Greenshot: A screenshot tool optimized for productivity. Save a screenshot or a
 
 CHANGE LOG:
 
-1.0.0 build 1888 (Unstable, meaning we are in testing fase and haven't released yet)
+1.0.0 build 1892 (Unstable, meaning we are in testing fase and haven't released yet)
 
 We changed the version to 1.0.0, after 5 year the version should no longer have a "beta" feeling!