Fixed bug where filters cannot be cycled while with cmd+f while one o…

…f the panes is hidden.
andytill · Oct 30, 2015 · 9e7a313 · 9e7a313
1 parent 1972ad2
commit 9e7a313
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/main/java/erlyberly/FilterFocusManager.java b/src/main/java/erlyberly/FilterFocusManager.java
@@ -50,9 +50,17 @@ private static Control findNextFilter() {
             focused = 0;
         }
         else {
-            focused++;
-            if(focused >= filters.size()) {
-                focused = 0;
+            // iterate the filters until we find one that is part of the scene or we run out of filters
+            int iterations = 0;
+            while(iterations < filters.size()) {
+                iterations++;
+                focused++;
+                if(focused >= filters.size()) {
+                    focused = 0;
+                }
+                boolean isFocusable = filters.get(focused).getScene() != null;
+                if(isFocusable)
+                    break;
             }
         }