Merge pull request #74 from regolith-linux/wayland_err_no_match

fix(wayland): ilia returns empty keybindings page if an include doesn't match
regolith-linux · Jul 23, 2023 · 5745c5b · 5745c5b
2 parents 877a2df + 62aef17
commit 5745c5b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/keybindings/I3Ipc.vala b/src/keybindings/I3Ipc.vala
@@ -118,7 +118,7 @@ namespace Ilia {
                 // Head of queue doesn't change if the string doesn't contain widcards
                 Posix.Glob pathMatcher = Posix.Glob ();
                 string path_glob = path_queue.pop_head ();
-                pathMatcher.glob (path_glob);
+                pathMatcher.glob (path_glob, Posix.GLOB_NOCHECK | Posix.GLOB_NOSORT);
                 foreach (unowned string matched_path in pathMatcher.pathv) {
                     path_queue.push_head (matched_path);
                 }
@@ -134,7 +134,12 @@ namespace Ilia {
 
                 // Read config partial and append to config builder
                 string config_partial;
-                FileUtils.get_contents (config_path, out config_partial);
+                try {
+                  FileUtils.get_contents (config_path, out config_partial);
+                } catch (GLib.Error err) {
+                  continue;
+                }
+
                 configBuilder.append (config_partial);
 
                 // Append paths of configs included from current config partial to queue for bfs