Merge remote-tracking branch 'uncool/cst-next'

Origin commit data
------------------
Commit: 33676d28bf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-21 (Mon, 21 Dec 2015)
This commit is contained in:
Stefan Seyfried
2015-12-21 14:38:26 +01:00
14 changed files with 133 additions and 47 deletions

View File

@@ -968,7 +968,7 @@ void CPersonalizeGui::addPersonalizedItems()
v_item[i].menuItem->hintIcon = fw->hintIcon;
v_item[i].menuItem->hint = fw->hint;
//add item if it's set to visible or pin protected and allow to add an forwarder as next
if (v_item[i].menuItem->active && (p_mode != PERSONALIZE_MODE_NOTVISIBLE || i_mode == PERSONALIZE_SHOW_AS_ACCESS_OPTION))
if (p_mode != PERSONALIZE_MODE_NOTVISIBLE || i_mode == PERSONALIZE_SHOW_AS_ACCESS_OPTION)
{
//add item
v_item[i].widget->addItem(v_item[i].menuItem, v_item[i].default_selected); //forwarders...