Merge branch 'macos-ignore-non-existent-dirs-split-tunneling'

mullvad · May 29, 2024 · ba741db · ba741db
2 parents b70eddc + 0cb3d34
commit ba741db
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/gui/src/main/macos-split-tunneling.ts b/gui/src/main/macos-split-tunneling.ts
@@ -127,8 +127,16 @@ export class MacOsSplitTunnelingAppListRetriever implements ISplitTunnelingAppLi
    * Returns contents of directory with results as absolute paths.
    */
   private async readDirectory(applicationDir: string) {
-    const basenames = await fs.readdir(applicationDir);
-    return basenames.map((basename) => path.join(applicationDir, basename));
+    try {
+      const basenames = await fs.readdir(applicationDir);
+      return basenames.map((basename) => path.join(applicationDir, basename));
+    } catch (err) {
+      const e = err as NodeJS.ErrnoException;
+      if (e.code !== 'ENOENT' && e.code !== 'ENOTDIR') {
+        log.error(`Failed to read directory contents: ${applicationDir}`, err);
+      }
+      return [];
+    }
   }
 
   private async readApplicationBundlePlist(applicationBundlePath: string): Promise<Plist> {