diff options
| author | Siri Hansen <[email protected]> | 2017-09-19 16:29:33 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-09-19 16:29:33 +0200 |
| commit | 8b24be58d37a8912efdcec9cd1e354cfa41e4ef4 (patch) | |
| tree | 4dd56d366268fbb37e12ea9d564e9f24b81566aa /lib/observer/src/observer_procinfo.erl | |
| parent | 6d11362936408091aa7108c252f2f7bf20cdc327 (diff) | |
| parent | 3979e914660993a06f1a84dd6e4196181964609a (diff) | |
| download | otp-8b24be58d37a8912efdcec9cd1e354cfa41e4ef4.tar.gz otp-8b24be58d37a8912efdcec9cd1e354cfa41e4ef4.tar.bz2 otp-8b24be58d37a8912efdcec9cd1e354cfa41e4ef4.zip | |
Merge branch 'maint'
Conflicts:
lib/observer/src/crashdump_viewer.erl
lib/sasl/src/sasl.appup.src
lib/stdlib/src/stdlib.appup.src
Diffstat (limited to 'lib/observer/src/observer_procinfo.erl')
| -rw-r--r-- | lib/observer/src/observer_procinfo.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl index d1665cec06..4ce38e439d 100644 --- a/lib/observer/src/observer_procinfo.erl +++ b/lib/observer/src/observer_procinfo.erl @@ -151,7 +151,7 @@ handle_event(#wx{event=#wxHtmlLink{linkInfo=#wxHtmlLinkInfo{href=Href}}}, Opened = case lists:keyfind(Id,1,Opened0) of false -> - Win = cdv_detail_wx:start_link(Id,[],Frame,Callback), + Win = cdv_detail_wx:start_link(Id,[],Frame,Callback,obs), [{Id,Win}|Opened0]; {_,Win} -> wxFrame:raise(Win), |