diff --git a/Greenshot/Greenshot.exe.config b/Greenshot/Greenshot.exe.config index 4543c429f..eea8499f5 100644 --- a/Greenshot/Greenshot.exe.config +++ b/Greenshot/Greenshot.exe.config @@ -6,5 +6,8 @@ + + + \ No newline at end of file diff --git a/Greenshot/GreenshotMain.cs b/Greenshot/GreenshotMain.cs index d1c49ff29..89b5d06f5 100644 --- a/Greenshot/GreenshotMain.cs +++ b/Greenshot/GreenshotMain.cs @@ -28,8 +28,6 @@ namespace Greenshot { /// Description of Main. /// public class GreenshotMain { - private const string PAF_PATH = @"App\Greenshot"; - static GreenshotMain() { AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve); } @@ -49,8 +47,6 @@ namespace Greenshot { [STAThread] public static void Main(string[] args) { - // Needed to make Greenshot portable, the path should be appended before the DLL's are loaded!! - AppDomain.CurrentDomain.AppendPrivatePath(PAF_PATH); MainForm.Start(args); } } diff --git a/Greenshot/log4net-portable.xml b/Greenshot/log4net-portable.xml index 6be33994a..bff2b7fc2 100644 --- a/Greenshot/log4net-portable.xml +++ b/Greenshot/log4net-portable.xml @@ -1,23 +1,23 @@  - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file