Skip to content

Remove ini watcher code (M1 fix) #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Shivansps merged 1 commit into from
Apr 12, 2026
Merged

Remove ini watcher code (M1 fix) #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 0 additions & 63 deletions Knossos.NET/Models/GlobalSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,6 @@ public ModSortType sortType
public string envVars { get; set; } = string.Empty;
[JsonPropertyName("show_dev_options")]
public bool showDevOptions { get; set; } = false;

[JsonIgnore]
private FileSystemWatcher? iniWatcher = null;

/// <summary>
/// Call this when the app is closing to save settings if we have pending changes
Expand All @@ -347,57 +344,6 @@ public void SaveSettingsOnAppClose()
}
}

/// <summary>
/// When the User is on the settings tab we must watch the fs2_open.ini for external changes
/// This is the initial call that must be called once, then we start or stop raising of events
/// </summary>
private void StartWatchingDirectory()
{
iniWatcher = new FileSystemWatcher(KnUtils.GetFSODataFolderPath());
iniWatcher.NotifyFilter = NotifyFilters.LastWrite;
iniWatcher.Changed += OnIniChanged;
iniWatcher.Filter = "fs2_open.ini";
}

/// <summary>
/// If the fs2_open.ini is changed externally, reload the data
/// </summary>
private void OnIniChanged(object sender, FileSystemEventArgs e)
{
iniWatcher!.EnableRaisingEvents = false;
Dispatcher.UIThread.InvokeAsync(() =>
{
Log.Add(Log.LogSeverity.Information, "GlobalSettings.OnIniChanged()", "fs2_open.ini was changed externally, loading data.");
Load();
MainWindowViewModel.Instance?.GlobalSettingsLoadData();
});
Task.Delay(1000);
iniWatcher!.EnableRaisingEvents = true;
}

/// <summary>
/// Start watching for changes on the ini file
/// </summary>
public void EnableIniWatch()
{
if (iniWatcher != null)
iniWatcher.EnableRaisingEvents = true;
else
{
StartWatchingDirectory();
EnableIniWatch();
}
}

/// <summary>
/// Stop watching for changes on the ini file
/// </summary>
public void DisableIniWatch()
{
if(iniWatcher != null)
iniWatcher.EnableRaisingEvents = false;
}

/// <summary>
/// Load setting data that saves on the fs2_open.ini
/// On the ini we save all data that is used by both FSO and KNET
Expand Down Expand Up @@ -944,12 +890,6 @@ public void WriteFS2IniValues(string? customFullPath = null)
data["PXO"]["Login"] = pxoLogin;
data["PXO"]["Password"] = pxoPassword;

bool wasWatchingIni = false;
if (iniWatcher != null)
{
wasWatchingIni = iniWatcher.EnableRaisingEvents;
iniWatcher.EnableRaisingEvents = false;
}
if (customFullPath == null)
{
parser.WriteFile(KnUtils.GetFSODataFolderPath() + Path.DirectorySeparatorChar + "fs2_open.ini", data, new UTF8Encoding(false));
Expand All @@ -961,9 +901,6 @@ public void WriteFS2IniValues(string? customFullPath = null)
parser.WriteFile(customFullPath, data, new UTF8Encoding(false));
Log.Add(Log.LogSeverity.Information, "GlobalSettings.WriteFS2IniValues", "Writen ini: " + customFullPath);
}

if (iniWatcher!= null && wasWatchingIni)
iniWatcher.EnableRaisingEvents = true;
}
catch (Exception ex)
{
Expand Down
5 changes: 0 additions & 5 deletions Knossos.NET/ViewModels/Windows/MainWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,8 @@ partial void OnSelectedMenuItemChanged(MainViewMenuItem? value)
}
Knossos.globalSettings.Load();
GlobalSettingsView?.LoadData();
//Knossos.globalSettings.EnableIniWatch();
GlobalSettingsView?.UpdateImgCacheSize();
}
else
{
//Knossos.globalSettings.DisableIniWatch();
}

//Custom Views
if (CurrentViewModel != null && CustomLauncher.IsCustomMode)
Expand Down