diff options
| -rw-r--r-- | src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java b/src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java index 6c59980c44..55b3bcf189 100644 --- a/src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java +++ b/src/com/itmill/toolkit/terminal/web/CollectionThemeSource.java @@ -122,13 +122,11 @@ public class CollectionThemeSource implements ThemeSource { // Get list of themes to look for the resource List themes = new LinkedList(); - if (themeName.length() > 0) { + while (themeName != null && themeName.length() > 0) { Theme t = this.getThemeByName(themeName); - if (t != null) { + if (t != null) themes.add(themeName); - if (t.getParent() != null) - themes.add(t.getParent()); - } + themeName = t.getParent(); } // Iterate all themes in list |