diff options
author | Anders Svensson <[email protected]> | 2011-08-24 16:44:16 +0200 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2011-08-24 16:44:16 +0200 |
commit | 3536111957c809976ed3e7091e85960990be904d (patch) | |
tree | aafc4cf4f996ece272e6b9c3d2366061c34f08da /lib/et | |
parent | a7c0e439ee84d25ce18f65959be06315063a7de8 (diff) | |
parent | 0c09797c725c98e5466bf6c575b7be4f2fc0e813 (diff) | |
download | otp-3536111957c809976ed3e7091e85960990be904d.tar.gz otp-3536111957c809976ed3e7091e85960990be904d.tar.bz2 otp-3536111957c809976ed3e7091e85960990be904d.zip |
Merge remote branch 'upstream/dev' into dev
Diffstat (limited to 'lib/et')
-rw-r--r-- | lib/et/src/et_wx_viewer.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/et/src/et_wx_viewer.erl b/lib/et/src/et_wx_viewer.erl index 7d4286ed9d..386f8fc86b 100644 --- a/lib/et/src/et_wx_viewer.erl +++ b/lib/et/src/et_wx_viewer.erl @@ -257,10 +257,10 @@ parse_opt([H | T], S, CollectorOpt) -> Actors = [create_actor(Name) || Name <- ActorNames2], parse_opt(T, S#state{actors = Actors}, CollectorOpt); {include, ActorNames} when is_list(ActorNames) -> - Actors = [opt_create_actor(Name, include, S#state.actors) || Name <- ActorNames], + Actors = [opt_create_actor(Name, include, S) || Name <- ActorNames], parse_opt(T, S#state{actors = Actors}, CollectorOpt); {exclude, ActorNames} when is_list(ActorNames) -> - Actors = [opt_create_actor(Name, exclude, S#state.actors) || Name <- ActorNames], + Actors = [opt_create_actor(Name, exclude, S) || Name <- ActorNames], parse_opt(T, S#state{actors = Actors}, CollectorOpt); {first_event, _FirstKey} -> %% NYI |