diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2015-01-12 18:01:34 +0900 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2015-01-12 18:01:34 +0900 |
| commit | 82014cad2c11b40e455e0578d22f09b04ebd1e5c (patch) | |
| tree | 554955b2dda53ce509245eaed422a706fafedc3b /src/bin/edje | |
| parent | 0cb33a46758bd1f66653e97d7ad027a9529b1279 (diff) | |
efl - edje_cc - fix default state checks in previous commit
this fixes 0cb33a46758bd1f66653e97d7ad027a9529b1279
@fix
Diffstat (limited to 'src/bin/edje')
| -rw-r--r-- | src/bin/edje/edje_cc_handlers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index dfb8ed48de..df2b1d2a95 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c | |||
| @@ -6478,7 +6478,7 @@ st_collections_group_parts_part_description_state(void) | |||
| 6478 | if (ep->other.desc_count) ed = ep->other.desc[ep->other.desc_count - 1]; | 6478 | if (ep->other.desc_count) ed = ep->other.desc[ep->other.desc_count - 1]; |
| 6479 | 6479 | ||
| 6480 | s = parse_str(0); | 6480 | s = parse_str(0); |
| 6481 | if (!strcmp(s, "default")) | 6481 | if ((!current_group_inherit) && (!strcmp(s, "default"))) |
| 6482 | { | 6482 | { |
| 6483 | double v; | 6483 | double v; |
| 6484 | 6484 | ||
| @@ -6500,7 +6500,7 @@ st_collections_group_parts_part_description_state(void) | |||
| 6500 | file_in, line - 1, s); | 6500 | file_in, line - 1, s); |
| 6501 | exit(-1); | 6501 | exit(-1); |
| 6502 | } | 6502 | } |
| 6503 | if (ed == ep->default_desc) | 6503 | if ((!current_group_inherit) && (ed == ep->default_desc)) |
| 6504 | { | 6504 | { |
| 6505 | if (strcmp(s, "default")) | 6505 | if (strcmp(s, "default")) |
| 6506 | { | 6506 | { |