From: Bellai Ádám <USER\adam.bellai>
Date: Thu, 12 Oct 2017 12:35:56 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=5f8b86e7e12777cfe5323bb0d185c53267065ec9;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30608
---

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index 30e7ee39..815bda0f 100644
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -284,8 +284,10 @@ namespace Maestro {
         }
 
         private void buttonDeleteFilter_Click(object sender, EventArgs e) {
-            bindingSource.RemoveFilter();
-            txtSorceFilter.Text = string.Empty;
+            if (!String.IsNullOrEmpty(txtSorceFilter.Text)) {
+                bindingSource.RemoveFilter();
+                txtSorceFilter.Text = string.Empty;
+            }
         }
     }
 }
diff --git a/client/Maestro/Sources/FileSystemSource.cs b/client/Maestro/Sources/FileSystemSource.cs
index 80753f62..042e4b8e 100644
--- a/client/Maestro/Sources/FileSystemSource.cs
+++ b/client/Maestro/Sources/FileSystemSource.cs
@@ -61,7 +61,7 @@ namespace Maestro.Sources {
                     cache.AddRange(this);
                 filter = value;
                 Clear();
-                cache.Where(i => i.Name.ToLower().StartsWith(filter.ToLower())).ToList().ForEach(i => Add(i));
+                cache.Where(i => i.Name.ToLower().Contains(filter.ToLower())).ToList().ForEach(i => Add(i));
             }
         }
 
diff --git a/client/Maestro/Sources/NexioRESTSource.cs b/client/Maestro/Sources/NexioRESTSource.cs
index fae0acf3..478fa0b6 100644
--- a/client/Maestro/Sources/NexioRESTSource.cs
+++ b/client/Maestro/Sources/NexioRESTSource.cs
@@ -68,7 +68,7 @@ namespace Maestro.Sources {
                     cache.AddRange(this);
                 filter = value;
                 Clear();
-                cache.Where(i => i.Name.ToLower().StartsWith(filter.ToLower())).ToList().ForEach(i => Add(i));
+                cache.Where(i => i.Name.ToLower().Contains(filter.ToLower())).ToList().ForEach(i => Add(i));
             }
         }