diff options
author | Siri Hansen <[email protected]> | 2017-01-26 11:20:20 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2017-01-26 11:20:20 +0100 |
commit | bcb9300382459deea91038f4847ef3fa70137f11 (patch) | |
tree | 954b9fbf642108082684136b32b71b8a8d925103 /lib/observer/src/observer_app_wx.erl | |
parent | 9153f7a734ddd9ca47b339cb19b8d44ed79ade0f (diff) | |
parent | 15dd52f771314b6eade47314afcd8b3206c694b1 (diff) | |
download | otp-bcb9300382459deea91038f4847ef3fa70137f11.tar.gz otp-bcb9300382459deea91038f4847ef3fa70137f11.tar.bz2 otp-bcb9300382459deea91038f4847ef3fa70137f11.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/observer/src/observer_app_wx.erl')
-rw-r--r-- | lib/observer/src/observer_app_wx.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/observer/src/observer_app_wx.erl b/lib/observer/src/observer_app_wx.erl index 936b2783e2..80a41fdde9 100644 --- a/lib/observer/src/observer_app_wx.erl +++ b/lib/observer/src/observer_app_wx.erl @@ -191,8 +191,8 @@ handle_event(#wx{event=#wxMouse{type=Type, x=X0, y=Y0}}, end; handle_event(#wx{event=#wxCommand{type=command_menu_selected}}, - State = #state{sel=undefined}) -> - observer_lib:display_info_dialog("Select process first"), + State = #state{panel=Panel,sel=undefined}) -> + observer_lib:display_info_dialog(Panel,"Select process first"), {noreply, State}; handle_event(#wx{id=?ID_PROC_INFO, event=#wxCommand{type=command_menu_selected}}, @@ -205,7 +205,7 @@ handle_event(#wx{id=?ID_PROC_MSG, event=#wxCommand{type=command_menu_selected}}, case observer_lib:user_term(Panel, "Enter message", "") of cancel -> ok; {ok, Term} -> Pid ! Term; - {error, Error} -> observer_lib:display_info_dialog(Error) + {error, Error} -> observer_lib:display_info_dialog(Panel,Error) end, {noreply, State}; @@ -214,7 +214,7 @@ handle_event(#wx{id=?ID_PROC_KILL, event=#wxCommand{type=command_menu_selected}} case observer_lib:user_term(Panel, "Enter Exit Reason", "kill") of cancel -> ok; {ok, Term} -> exit(Pid, Term); - {error, Error} -> observer_lib:display_info_dialog(Error) + {error, Error} -> observer_lib:display_info_dialog(Panel,Error) end, {noreply, State}; |