aboutsummaryrefslogtreecommitdiffstats
path: root/lib/observer/src/observer_procinfo.erl
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2014-02-14 10:01:05 +0100
committerDan Gudmundsson <[email protected]>2014-02-14 10:01:05 +0100
commit9f698ad63586735de169fb514f22eea5164e173b (patch)
tree019e1297c9a00189999aa0d8437baac4c14e07c5 /lib/observer/src/observer_procinfo.erl
parentc0667d05f1295930dacc80f82b985183fd800961 (diff)
parentb07eae7aefeff5d42e11c319c660f1f2d2cac5fd (diff)
downloadotp-9f698ad63586735de169fb514f22eea5164e173b.tar.gz
otp-9f698ad63586735de169fb514f22eea5164e173b.tar.bz2
otp-9f698ad63586735de169fb514f22eea5164e173b.zip
Merge branch 'dgud/observer_fixes'
* dgud/observer_fixes: observer: catch progressbar errors observer: Fix observer crash when closing crashdumpviewer observer: Fix binary links observer: Fix crash when clicking on pid inside a html-term
Diffstat (limited to 'lib/observer/src/observer_procinfo.erl')
-rw-r--r--lib/observer/src/observer_procinfo.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/observer/src/observer_procinfo.erl b/lib/observer/src/observer_procinfo.erl
index 988e04993c..3ffa5fc77d 100644
--- a/lib/observer/src/observer_procinfo.erl
+++ b/lib/observer/src/observer_procinfo.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2011-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -136,9 +136,9 @@ handle_event(#wx{event=#wxHtmlLink{linkInfo=#wxHtmlLinkInfo{href=Href}}},
{noreply, State};
Callback ->
[{"key1",Key1},{"key2",Key2},{"key3",Key3}] = httpd:parse_query(Rest),
- Id = {observer, {T,{list_to_integer(Key1),
- list_to_integer(Key2),
- list_to_integer(Key3)}}},
+ Id = {obs, {T,{list_to_integer(Key1),
+ list_to_integer(Key2),
+ list_to_integer(Key3)}}},
Opened =
case lists:keyfind(Id,1,Opened0) of
false ->