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

Merge 4e7da54a22 into c1ad1d4a93

Browse source
This commit is contained in:
Christian Schulz 2025-08-18 10:47:44 -06:00 • committed by GitHub
commit 280c912de6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 45 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/Greenshot.Base/IniFile/IniConfig.cs
View file

@ -41,6 +41,11 @@ namespace Greenshot.Base.IniFile
/// </summary>
private static readonly object IniLock = new object();
/// <summary>
/// A lock object for the section map
/// </summary>
private static readonly object SectionMapLock = new object();
/// <summary>
/// As the ini implementation is kept someone generic, for reusing, this holds the name of the application
/// </summary>
@ -290,23 +295,26 @@ namespace Greenshot.Base.IniFile
// Load the fixed settings
_fixedProperties = Read(CreateIniLocation(_configName + FixedPostfix + IniExtension, true));
foreach (IniSection section in SectionMap.Values)
lock (SectionMapLock)
{
try
foreach (IniSection section in SectionMap.Values)
{
section.Fill(PropertiesForSection(section));
FixProperties(section);
}
catch (Exception ex)
{
string sectionName = "unknown";
if (section?.IniSectionAttribute?.Name != null)
try
{
sectionName = section.IniSectionAttribute.Name;
section.Fill(PropertiesForSection(section));
FixProperties(section);
}
catch (Exception ex)
{
string sectionName = "unknown";
if (section?.IniSectionAttribute?.Name != null)
{
sectionName = section.IniSectionAttribute.Name;
}
Log.WarnFormat("Problem reading the ini section {0}", sectionName);
Log.Warn("Exception", ex);
Log.WarnFormat("Problem reading the ini section {0}", sectionName);
Log.Warn("Exception", ex);
}
}
}
}
@ -389,7 +397,12 @@ namespace Greenshot.Base.IniFile
{
get
{
foreach (string sectionName in SectionMap.Keys)
List<string> sectionNames;
lock (SectionMapLock)
{
sectionNames = [.. SectionMap.Keys];
}
foreach (string sectionName in sectionNames)
{
yield return sectionName;
}
@ -403,8 +416,11 @@ namespace Greenshot.Base.IniFile
/// <returns></returns>
public static IniSection GetIniSection(string sectionName)
{
SectionMap.TryGetValue(sectionName, out var returnValue);
return returnValue;
lock (SectionMapLock)
{
SectionMap.TryGetValue(sectionName, out var returnValue);
return returnValue;
}
}
/// <summary>
@ -429,20 +445,24 @@ namespace Greenshot.Base.IniFile
Type iniSectionType = typeof(T);
string sectionName = IniSection.GetIniSectionAttribute(iniSectionType).Name;
if (SectionMap.ContainsKey(sectionName))
lock (SectionMapLock)
{
if (SectionMap.ContainsKey(sectionName))
{
//LOG.Debug("Returning pre-mapped section " + sectionName);
section = (T) SectionMap[sectionName];
}
else
{
section = (T)SectionMap[sectionName];
}
else
{
// Create instance of this type
section = (T) Activator.CreateInstance(iniSectionType);
section = (T)Activator.CreateInstance(iniSectionType);
// Store for later save & retrieval
SectionMap.Add(sectionName, section);
section.Fill(PropertiesForSection(section));
FixProperties(section);
SectionMap.Add(sectionName, section);
section.Fill(PropertiesForSection(section));
FixProperties(section);
}
}
if (allowSave && section.IsDirty)