diff options
-rw-r--r-- | xbmc/addons/GUIDialogAddonSettings.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/xbmc/addons/GUIDialogAddonSettings.cpp b/xbmc/addons/GUIDialogAddonSettings.cpp index 63dc063b37..4d6dbecbb2 100644 --- a/xbmc/addons/GUIDialogAddonSettings.cpp +++ b/xbmc/addons/GUIDialogAddonSettings.cpp @@ -72,8 +72,8 @@ using XFILE::CDirectory; #define ID_BUTTON_DEFAULT 12 #define CONTROL_HEADING_LABEL 20 -#define CONTROL_START_SETTING 100 -#define CONTROL_START_SECTION 200 +#define CONTROL_START_SECTION 100 +#define CONTROL_START_SETTING 200 CGUIDialogAddonSettings::CGUIDialogAddonSettings() : CGUIDialogBoxBase(WINDOW_DIALOG_ADDON_SETTINGS, "DialogAddonSettings.xml") @@ -610,6 +610,12 @@ void CGUIDialogAddonSettings::CreateSections() if (label.empty()) label = g_localizeStrings.Get(128); + if (buttonID >= CONTROL_START_SETTING) + { + CLog::Log(LOGERROR, "%s - cannot have more than %d categories - simplify your addon!", __FUNCTION__, CONTROL_START_SETTING - CONTROL_START_SECTION); + break; + } + // add the category button if (button && group) { @@ -893,11 +899,6 @@ void CGUIDialogAddonSettings::CreateControls() setting = setting->NextSiblingElement("setting"); controlId++; - if (controlId >= CONTROL_START_SECTION) - { - CLog::Log(LOGERROR, "%s - cannot have more than %d controls per category - simplify your addon!", __FUNCTION__, CONTROL_START_SECTION - CONTROL_START_SETTING); - break; - } } EnableControls(); } |