github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 21:13:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Trying to see if LoadFrom is more stable than LoadFile, this is discussed in many blogs.. also fixed a file reference in the project.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1893 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-05-22 04:48:08 +00:00
commit 6459dd2bf3
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Greenshot/Greenshot.csproj
View file

@ -361,7 +361,7 @@
<None Include="Languages\language-sk-SK.xml"> <None Include="Languages\language-sk-SK.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Include="Languages\language-sr-SR.xml"> <None Include="Languages\language-sr-RS.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Include="Languages\language-sv-SE.xml"> <None Include="Languages\language-sv-SE.xml">

2
Greenshot/Helpers/PluginHelper.cs
View file

@ -229,7 +229,7 @@ namespace Greenshot.Helpers {
foreach (string pluginFile in pluginFiles) { foreach (string pluginFile in pluginFiles) {
LOG.DebugFormat("Checking the following file for plugins: {0}", pluginFile); LOG.DebugFormat("Checking the following file for plugins: {0}", pluginFile);
try { 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[]; PluginAttribute[] pluginAttributes = assembly.GetCustomAttributes(typeof(PluginAttribute), false) as PluginAttribute[];
if (pluginAttributes.Length > 0) { if (pluginAttributes.Length > 0) {
PluginAttribute pluginAttribute = pluginAttributes[0]; PluginAttribute pluginAttribute = pluginAttributes[0];

2
Greenshot/releases/additional_files/readme.txt
View file

@ -3,7 +3,7 @@ Greenshot: A screenshot tool optimized for productivity. Save a screenshot or a
CHANGE LOG: 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! We changed the version to 1.0.0, after 5 year the version should no longer have a "beta" feeling!