aboutsummaryrefslogtreecommitdiffstats
path: root/lib/observer
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2015-03-30 09:04:16 +0200
committerDan Gudmundsson <[email protected]>2015-03-30 09:04:16 +0200
commit64bebeaf45403feeac45a8c2b6226d6bc8b71b72 (patch)
tree9f323cdf904ea21026c926f1142d31ad8eeb5562 /lib/observer
parent45f33f09d56af793a2142ab402d73868be30b223 (diff)
parent21a1802064b3c2293687f2ba4171eb2389377e47 (diff)
downloadotp-64bebeaf45403feeac45a8c2b6226d6bc8b71b72.tar.gz
otp-64bebeaf45403feeac45a8c2b6226d6bc8b71b72.tar.bz2
otp-64bebeaf45403feeac45a8c2b6226d6bc8b71b72.zip
Merge branch 'dgud/observer/fix-atom-tostr/OTP-12634' into maint
* dgud/observer/fix-atom-tostr/OTP-12634: observer: Fix crash in process_window
Diffstat (limited to 'lib/observer')
-rw-r--r--lib/observer/src/observer_lib.erl7
-rw-r--r--lib/observer/src/observer_wx.erl3
2 files changed, 6 insertions, 4 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}.
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl
index c86f5ea916..15df804975 100644
--- a/lib/observer/src/observer_wx.erl
+++ b/lib/observer/src/observer_wx.erl
@@ -422,8 +422,7 @@ return_to_localnode(Frame, Node) ->
end.
create_txt_dialog(Frame, Msg, Title, Style) ->
- MD = wxMessageDialog:new(Frame, Msg, [{style, Style}]),
- wxMessageDialog:setTitle(MD, Title),
+ MD = wxMessageDialog:new(Frame, Msg, [{style, Style}, {caption,Title}]),
wxDialog:showModal(MD),
wxDialog:destroy(MD).