1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/cyngn/theme/chooser/ThemeFragment.java b/src/com/cyngn/theme/chooser/ThemeFragment.java
index 085b23a..9ae1cdf 100644
--- a/src/com/cyngn/theme/chooser/ThemeFragment.java
+++ b/src/com/cyngn/theme/chooser/ThemeFragment.java
@@ -2208,7 +2208,11 @@ public class ThemeFragment extends Fragment implements LoaderManager.LoaderCallb
                                     = fillMissingComponentsWithDefault(componentsToApply);
                             ThemeManager tm = getThemeManager();
                             if (tm != null) {
-                                tm.addClient(ThemeFragment.this);
+                                try {
+                                    tm.addClient(ThemeFragment.this);
+                                } catch (IllegalArgumentException e) {
+                                    /* ignore since this means we already have a listener added */
+                                }
                                 tm.requestThemeChange(getThemeChangeRequestForComponents(fullMap),
                                         true);
                             }