diff options
| author | visciang <[email protected]> | 2017-01-26 11:18:12 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-01-26 11:18:12 +0100 |
| commit | 15dd52f771314b6eade47314afcd8b3206c694b1 (patch) | |
| tree | 1f3a9fd6dc693de52f30e968d56748880399aedd /lib/observer/src/observer_lib.erl | |
| parent | cd4a95b0abb45f07eef8a77991c2be8f5dea575e (diff) | |
| download | otp-15dd52f771314b6eade47314afcd8b3206c694b1.tar.gz otp-15dd52f771314b6eade47314afcd8b3206c694b1.tar.bz2 otp-15dd52f771314b6eade47314afcd8b3206c694b1.zip | |
Fix observer application crash (#1296)
Fix observer application crash
When clicking an HTML-link to a port before the port tab has been opened for the first time, observer would crash since port info is not initiated. This is now corrected.
Also, when clicking on an HTML link to a port, and the port does not exist,
then pop up an info dialog saying "No such port".
OTP-14151
Diffstat (limited to 'lib/observer/src/observer_lib.erl')
| -rw-r--r-- | lib/observer/src/observer_lib.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl index 1eaba31a3a..47844c1307 100644 --- a/lib/observer/src/observer_lib.erl +++ b/lib/observer/src/observer_lib.erl @@ -20,7 +20,7 @@ -module(observer_lib). -export([get_wx_parent/1, - display_info_dialog/1, display_yes_no_dialog/1, + display_info_dialog/2, display_yes_no_dialog/1, display_progress_dialog/2, destroy_progress_dialog/0, wait_for_progress/0, report_progress/1, user_term/3, user_term_multiline/3, @@ -105,10 +105,10 @@ setup_timer(Bool, {Timer, Old}) -> timer:cancel(Timer), setup_timer(Bool, {false, Old}). -display_info_dialog(Str) -> - display_info_dialog("",Str). -display_info_dialog(Title,Str) -> - Dlg = wxMessageDialog:new(wx:null(), Str, [{caption,Title}]), +display_info_dialog(Parent,Str) -> + display_info_dialog(Parent,"",Str). +display_info_dialog(Parent,Title,Str) -> + Dlg = wxMessageDialog:new(Parent, Str, [{caption,Title}]), wxMessageDialog:showModal(Dlg), wxMessageDialog:destroy(Dlg), ok. @@ -724,7 +724,7 @@ progress_loop(Title,PD,Caller) -> if is_list(Reason) -> Reason; true -> file:format_error(Reason) end, - display_info_dialog("Crashdump Viewer Error",FailMsg), + display_info_dialog(PD,"Crashdump Viewer Error",FailMsg), Caller ! error, unregister(?progress_handler), unlink(Caller); |