Commit 88e7565d authored by Claes Sjofors's avatar Claes Sjofors

Ge dynamic optionmeny, enum values reset at startup

parent 26c39723
...@@ -17989,6 +17989,7 @@ int GeOptionMenu::connect( grow_tObject object, glow_sTraceData *trace_data) ...@@ -17989,6 +17989,7 @@ int GeOptionMenu::connect( grow_tObject object, glow_sTraceData *trace_data)
} }
update_p = 0; update_p = 0;
if ( optionmenu_type == ge_eOptionMenuType_Dynamic) {
if ( strcmp( text_attribute, "") != 0 && strcmp( update_attribute, "") != 0) { if ( strcmp( text_attribute, "") != 0 && strcmp( update_attribute, "") != 0) {
db = dyn->parse_attr_name( update_attribute, parsed_name, db = dyn->parse_attr_name( update_attribute, parsed_name,
&inverted, &attr_type, &attr_size); &inverted, &attr_type, &attr_size);
...@@ -17998,6 +17999,11 @@ int GeOptionMenu::connect( grow_tObject object, glow_sTraceData *trace_data) ...@@ -17998,6 +17999,11 @@ int GeOptionMenu::connect( grow_tObject object, glow_sTraceData *trace_data)
} }
} }
// Reset item_enum
for ( int i = 0; i < 32; i++)
items_enum[i] = i;
}
trace_data->p = &pdummy; trace_data->p = &pdummy;
first_scan = true; first_scan = true;
return 1; return 1;
...@@ -18285,12 +18291,12 @@ int GeOptionMenu::action( grow_tObject object, glow_tEvent event) ...@@ -18285,12 +18291,12 @@ int GeOptionMenu::action( grow_tObject object, glow_tEvent event)
break; break;
} }
case pwr_eType_Int16: { case pwr_eType_Int16: {
pwr_tInt32 value = items_enum[event->menu.item]; pwr_tInt16 value = items_enum[event->menu.item];
sts = gdh_SetObjectInfo( parsed_name, &value, sizeof(value)); sts = gdh_SetObjectInfo( parsed_name, &value, sizeof(value));
break; break;
} }
case pwr_eType_UInt16: { case pwr_eType_UInt16: {
pwr_tUInt32 value = items_enum[event->menu.item]; pwr_tUInt16 value = items_enum[event->menu.item];
sts = gdh_SetObjectInfo( parsed_name, &value, sizeof(value)); sts = gdh_SetObjectInfo( parsed_name, &value, sizeof(value));
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment