github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9

Browse source
This commit is contained in:
Robin 2016-05-24 13:13:48 +02:00
commit 0323705513
276 changed files with 5382 additions and 3666 deletions
Download patch file Download diff file Expand all files Collapse all files

4
GreenshotPlugin/Core/LogHelper.cs
View file

@ -37,7 +37,7 @@ namespace GreenshotPlugin.Core {
public class LogHelper {
private const string LOG4NET_FILE = "log4net.xml";
private const string LOG4NET_PORTABLE_FILE = "log4net-portable.xml";
private static bool isLog4NetConfigured = false;
private static bool isLog4NetConfigured;
private const string INIT_MESSAGE = "Greenshot initialization of log system failed";
public static bool isInitialized {
get {
@ -101,7 +101,7 @@ namespace GreenshotPlugin.Core {
/// </summary>
public class SpecialFolderPatternConverter : PatternConverter {
override protected void Convert(TextWriter writer, object state) {
Environment.SpecialFolder specialFolder = (Environment.SpecialFolder)Enum.Parse(typeof(Environment.SpecialFolder), base.Option, true);
Environment.SpecialFolder specialFolder = (Environment.SpecialFolder)Enum.Parse(typeof(Environment.SpecialFolder), Option, true);
writer.Write(Environment.GetFolderPath(specialFolder));
}
}