From 36a4d095ed72420c1d696f4bf2e1605ed32ecc82 Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Sat, 24 Apr 2021 16:29:05 +0200
Subject: [PATCH] better handling of custom disk folders string

---
 src/modules/disk.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/modules/disk.c b/src/modules/disk.c
index 11cf6f546..e5bafce21 100644
--- a/src/modules/disk.c
+++ b/src/modules/disk.c
@@ -89,7 +89,7 @@ void ffPrintDisk(FFinstance* instance)
         if(rootRet != 0 && homeRet != 0)
         {
             FF_STRBUF_CREATE(key);
-            getKey(instance, &key, "/", false);
+            getKey(instance, &key, "", false);
             ffPrintError(instance, key.chars, 0, NULL, &instance->config.diskFormat, FF_DISK_NUM_FORMAT_ARGS, "statvfs failed for both / and /home");
             ffStrbufDestroy(&key);
             return;
@@ -103,6 +103,17 @@ void ffPrintDisk(FFinstance* instance)
     }
     else
     {
+        ffStrbufTrim(&instance->config.diskFolders, ':');
+
+        if(instance->config.diskFolders.length == 0)
+        {
+            FF_STRBUF_CREATE(key);
+            getKey(instance, &key, "", false);
+            ffPrintError(instance, key.chars, 0, NULL, &instance->config.diskFormat, FF_DISK_NUM_FORMAT_ARGS, "Custom disk folders string doesn't contain any folders");
+            ffStrbufDestroy(&key);
+            return;
+        }
+
         uint32_t lastIndex = 0;
         while (lastIndex < instance->config.diskFolders.length)
         {