Commit 3c6bd676 authored by Thomas Haller's avatar Thomas Haller

shared: fix parsing aliases for flags in _nm_utils_enum_from_str_full()

Otherwise, the last alias overwrites previous values.

Fixes: b9fa0e0a
parent daf4ba43
......@@ -6531,7 +6531,8 @@ test_nm_utils_enum (void)
_test_nm_utils_enum_from_str_do_full (color_flags,
"nick-4d,nick-red,nick-5,green,nick-red",
TRUE,
NM_TEST_GENERAL_COLOR_FLAGS_RED,
0x4D
| NM_TEST_GENERAL_COLOR_FLAGS_GREEN,
NULL,
color_value_infos);
......
......@@ -243,7 +243,7 @@ _nm_utils_enum_from_str_full (GType type,
else {
nick = _find_value_info (value_infos, s);
if (nick)
uvalue = (unsigned) nick->value;
uvalue |= (unsigned) nick->value;
else {
ret = FALSE;
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