diff options
| author | spiff <spiff@xbmc.org> | 2011-11-12 10:47:41 +0100 |
|---|---|---|
| committer | spiff <spiff@xbmc.org> | 2011-11-14 12:07:11 +0100 |
| commit | 0b8394f475aa6622b5eba2e591a4f3d7a0087d1a (patch) | |
| tree | 54cf5677b7f9a7926b51e7d3eadf7ca25bd6efe4 | |
| parent | 4bc1935302bb2eac08a7629a689d9ebb5186a94a (diff) | |
changed: allow no weather add-on
| -rw-r--r-- | addons/skin.confluence/720p/Home.xml | 2 | ||||
| -rw-r--r-- | xbmc/settings/GUIWindowSettingsCategory.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/skin.confluence/720p/Home.xml b/addons/skin.confluence/720p/Home.xml index 8e8fec820d..8d4c9cca2d 100644 --- a/addons/skin.confluence/720p/Home.xml +++ b/addons/skin.confluence/720p/Home.xml @@ -589,7 +589,7 @@ <onclick>ActivateWindow(Weather)</onclick> <icon>special://skin/backgrounds/weather.jpg</icon> <thumb>$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</thumb> - <visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible> + <visible>!Skin.HasSetting(HomeMenuNoWeatherButton)+!IsEmpty(Weather.Plugin)</visible> </item> <item id="4"> <label>1</label> diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp index 309d516de6..753c2b8703 100644 --- a/xbmc/settings/GUIWindowSettingsCategory.cpp +++ b/xbmc/settings/GUIWindowSettingsCategory.cpp @@ -1003,7 +1003,7 @@ void CGUIWindowSettingsCategory::OnClick(CBaseSettingControl *pSettingControl) { // prompt for the addon CSettingAddon *setting = (CSettingAddon *)pSettingControl->GetSetting(); CStdString addonID = setting->GetData(); - if (CGUIWindowAddonBrowser::SelectAddonID(setting->m_type, addonID, setting->m_type == ADDON_SCREENSAVER || setting->m_type == ADDON_VIZ) == 1) + if (CGUIWindowAddonBrowser::SelectAddonID(setting->m_type, addonID, setting->m_type == ADDON_SCREENSAVER || setting->m_type == ADDON_VIZ || setting->m_type == ADDON_SCRIPT_WEATHER) == 1) setting->SetData(addonID); else return; |