Merge remote-tracking branch 'origin/master' into fix-1063

1 files changed, 10 insertions, 3 deletions

diff --git a/src/assets.rs b/src/assets.rs
index 5e0c0644..55b4941e 100644
--- a/src/assets.rs
+++ b/src/assets.rs
@@ -38,9 +38,16 @@ impl HighlightingAssets {
         };
 
         let theme_dir = source_dir.join("themes");
-
-        let res = theme_set.add_from_folder(&theme_dir);
-        if res.is_err() {
+        if theme_dir.exists() {
+            let res = theme_set.add_from_folder(&theme_dir);
+            if let Err(err) = res {
+                println!(
+                    "Failed to load one or more themes from '{}' (reason: '{}')",
+                    theme_dir.to_string_lossy(),
+                    err,
+                );
+            }
+        } else {
             println!(
                 "No themes were found in '{}', using the default set",
                 theme_dir.to_string_lossy()