From 527b9321b51fd9ac71d80b0c35819b744bfbd684 Mon Sep 17 00:00:00 2001
From: Leon Styhre <leon@leonstyhre.com>
Date: Tue, 21 Sep 2021 22:15:42 +0200
Subject: [PATCH] Leading and trailing whitespaces are now trimmed when
 requesting a new custom collection name.

---
 es-app/src/CollectionSystemsManager.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/es-app/src/CollectionSystemsManager.cpp b/es-app/src/CollectionSystemsManager.cpp
index f9dfaeaf9..282b880a2 100644
--- a/es-app/src/CollectionSystemsManager.cpp
+++ b/es-app/src/CollectionSystemsManager.cpp
@@ -554,6 +554,15 @@ std::string CollectionSystemsManager::getValidNewCollectionName(std::string inNa
 {
     std::string name = inName;
 
+    // Trim leading and trailing whitespaces.
+    name.erase(name.begin(), std::find_if(name.begin(), name.end(), [](char c) {
+                   return !std::isspace(static_cast<unsigned char>(c));
+               }));
+    name.erase(std::find_if(name.rbegin(), name.rend(),
+                            [](char c) { return !std::isspace(static_cast<unsigned char>(c)); })
+                   .base(),
+               name.end());
+
     if (index == 0) {
         size_t remove = std::string::npos;
         // Get valid name.