aboutsummaryrefslogtreecommitdiffstats
path: root/lib/observer
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2015-03-30 09:06:11 +0200
committerDan Gudmundsson <[email protected]>2015-03-30 09:06:11 +0200
commitc6feb2f68e61a95e9c716e5a427f362461a4ade7 (patch)
tree9d8f8c43bcd9278f78149e22b17b8cd59ceda5b6 /lib/observer
parent8da49848433b060c44d541998d4ac94bf3fd25ea (diff)
parent64bebeaf45403feeac45a8c2b6226d6bc8b71b72 (diff)
downloadotp-c6feb2f68e61a95e9c716e5a427f362461a4ade7.tar.gz
otp-c6feb2f68e61a95e9c716e5a427f362461a4ade7.tar.bz2
otp-c6feb2f68e61a95e9c716e5a427f362461a4ade7.zip
Merge branch 'maint'
* maint: observer: Fix crash in process_window
Diffstat (limited to 'lib/observer')
-rw-r--r--lib/observer/src/observer_lib.erl7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index 34c7b127ff..9592ab5977 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -493,8 +493,11 @@ link_entry2(Panel,{Target,Str},Cursor) ->
wxWindow:setToolTip(TC, ToolTip),
TC.
-to_link(Tuple = {_Target, _Str}) ->
- Tuple;
+to_link(RegName={Name, Node}) when is_atom(Name), is_atom(Node) ->
+ Str = io_lib:format("{~p,~p}", [Name, Node]),
+ {RegName, Str};
+to_link(TI = {_Target, _Identifier}) ->
+ TI;
to_link(Target0) ->
Target=to_str(Target0),
{Target, Target}.