colin/SwayNotificationCenter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue where custom config wouldn't be used on reload

Browse Source
This commit is contained in:
Erik Reider
2023-06-08 20:52:01 +02:00
parent bc0fbcb5c1
commit 5eb7c2a511
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/configModel/configModel.vala
View File

@@ -309,11 +309,14 @@ namespace SwayNotificationCenter {
/** Reloads the config and calls `ModifyNode` before deserializing */ /** Reloads the config and calls `ModifyNode` before deserializing */
public static void reload_config (ModifyNode modify_cb = () => {}) { public static void reload_config (ModifyNode modify_cb = () => {}) {
// Re-check if config file path still exists
string path = Functions.get_config_path (_path);
ConfigModel m = null; ConfigModel m = null;
try { try {
if (_path.length == 0) return; if (path.strip ().length == 0) return;
Json.Parser parser = new Json.Parser (); Json.Parser parser = new Json.Parser ();
parser.load_from_file (_path); parser.load_from_file (path);
Json.Node ? node = parser.get_root (); Json.Node ? node = parser.get_root ();
if (node == null) { if (node == null) {
throw new Json.ParserError.PARSE ("Node is null!"); throw new Json.ParserError.PARSE ("Node is null!");
@@ -331,6 +334,7 @@ namespace SwayNotificationCenter {
stderr.printf (e.message + "\n"); stderr.printf (e.message + "\n");
} }
_instance = m ?? new ConfigModel (); _instance = m ?? new ConfigModel ();
_path = path;
debug (_instance.to_string ()); debug (_instance.to_string ());
} }