[Horus] Impossible to remove widgets in layouts

This commit is contained in:
Bertrand Songis
2016-05-23 21:20:55 +02:00
parent 144710f1f7
commit b7ad1ea226
2 changed files with 8 additions and 3 deletions
+1 -1
View File
@@ -286,7 +286,7 @@ void onZoneMenu(const char * result)
pushMenu(menuWidgetSettings);
}
else if (result == STR_REMOVE_WIDGET) {
currentContainer->setWidget(currentZone, NULL);
currentContainer->createWidget(currentZone, NULL);
storageDirty(EE_MODEL);
}
}
+7 -2
View File
@@ -82,8 +82,13 @@ class WidgetsContainer: public WidgetsContainerInterface
{
if (widgets) {
memset(persistentData->zones[index].widgetName, 0, sizeof(persistentData->zones[index].widgetName));
strncpy(persistentData->zones[index].widgetName, factory->getName(), sizeof(persistentData->zones[index].widgetName));
widgets[index] = factory->create(getZone(index), &persistentData->zones[index].widgetData);
if (factory) {
strncpy(persistentData->zones[index].widgetName, factory->getName(), sizeof(persistentData->zones[index].widgetName));
widgets[index] = factory->create(getZone(index), &persistentData->zones[index].widgetData);
}
else {
widgets[index] = NULL;
}
}
}