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

Merge branch 'bug/lock_section_map' into feature/new_greenshot_file_format_v2

Browse source
This commit is contained in:
Christian Schulz 2025-07-24 22:46:43 +02:00
commit e59eb95fcc
1 changed files with 45 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,11 @@ namespace Greenshot.Base.IniFile
/// </summary> /// </summary>
private static readonly object IniLock = new object(); private static readonly object IniLock = new object();
/// <summary>
/// A lock object for the section map
/// </summary>
private static readonly object SectionMapLock = new object();
/// <summary> /// <summary>
/// As the ini implementation is kept someone generic, for reusing, this holds the name of the application /// As the ini implementation is kept someone generic, for reusing, this holds the name of the application
/// </summary> /// </summary>
@ -290,6 +295,8 @@ namespace Greenshot.Base.IniFile
// Load the fixed settings // Load the fixed settings
_fixedProperties = Read(CreateIniLocation(_configName + FixedPostfix + IniExtension, true)); _fixedProperties = Read(CreateIniLocation(_configName + FixedPostfix + IniExtension, true));
lock (SectionMapLock)
{
foreach (IniSection section in SectionMap.Values) foreach (IniSection section in SectionMap.Values)
{ {
try try
@ -310,6 +317,7 @@ namespace Greenshot.Base.IniFile
} }
} }
} }
}
/// <summary> /// <summary>
/// This "fixes" the properties of the section, meaning any properties in the fixed file can't be changed. /// This "fixes" the properties of the section, meaning any properties in the fixed file can't be changed.
@ -389,7 +397,12 @@ namespace Greenshot.Base.IniFile
{ {
get get
{ {
foreach (string sectionName in SectionMap.Keys) List<string> sectionNames;
lock (SectionMapLock)
{
sectionNames = [.. SectionMap.Keys];
}
foreach (string sectionName in sectionNames)
{ {
yield return sectionName; yield return sectionName;
} }
@ -402,10 +415,13 @@ namespace Greenshot.Base.IniFile
/// <param name="sectionName"></param> /// <param name="sectionName"></param>
/// <returns></returns> /// <returns></returns>
public static IniSection GetIniSection(string sectionName) public static IniSection GetIniSection(string sectionName)
{
lock (SectionMapLock)
{ {
SectionMap.TryGetValue(sectionName, out var returnValue); SectionMap.TryGetValue(sectionName, out var returnValue);
return returnValue; return returnValue;
} }
}
/// <summary> /// <summary>
/// A generic method which returns an instance of the supplied type, filled with it's configuration /// A generic method which returns an instance of the supplied type, filled with it's configuration
@ -429,6 +445,9 @@ namespace Greenshot.Base.IniFile
Type iniSectionType = typeof(T); Type iniSectionType = typeof(T);
string sectionName = IniSection.GetIniSectionAttribute(iniSectionType).Name; string sectionName = IniSection.GetIniSectionAttribute(iniSectionType).Name;
lock (SectionMapLock)
{
if (SectionMap.ContainsKey(sectionName)) if (SectionMap.ContainsKey(sectionName))
{ {
//LOG.Debug("Returning pre-mapped section " + sectionName); //LOG.Debug("Returning pre-mapped section " + sectionName);
@ -444,6 +463,7 @@ namespace Greenshot.Base.IniFile
section.Fill(PropertiesForSection(section)); section.Fill(PropertiesForSection(section));
FixProperties(section); FixProperties(section);
} }
}
if (allowSave && section.IsDirty) if (allowSave && section.IsDirty)
{ {