diff options
| author | Peter Andersson <[email protected]> | 2016-08-25 11:35:46 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2016-08-25 11:35:46 +0200 |
| commit | 2a6750d0804d1e30a5463c8aaf5b7342fda967fe (patch) | |
| tree | bbf183c6d0eb5366db4aa839568e72c4bb53e6f5 /lib/debugger/src/dbg_wx_trace.erl | |
| parent | e3952b06cc38dcb9939936140bf07a37a428e46b (diff) | |
| parent | bc544c51d84bfd61f3dafc5048e86cea02641b43 (diff) | |
| download | otp-2a6750d0804d1e30a5463c8aaf5b7342fda967fe.tar.gz otp-2a6750d0804d1e30a5463c8aaf5b7342fda967fe.tar.bz2 otp-2a6750d0804d1e30a5463c8aaf5b7342fda967fe.zip | |
Merge branch 'peppe/debugger_crash/ERL-191/OTP-13756' into maint
* peppe/debugger_crash/ERL-191/OTP-13756:
Make sure exit in non-interpreted code doesn't crash the debugger
OTP-13756
Diffstat (limited to 'lib/debugger/src/dbg_wx_trace.erl')
| -rw-r--r-- | lib/debugger/src/dbg_wx_trace.erl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl index 6af19af33b..29c8e8cefb 100644 --- a/lib/debugger/src/dbg_wx_trace.erl +++ b/lib/debugger/src/dbg_wx_trace.erl @@ -818,11 +818,14 @@ gui_show_module(Win, Mod, Line, _Cm, Pid, How) -> gui_load_module(Win, Mod, _Pid) -> dbg_wx_trace_win:display(Win,{text, "Loading module..."}), - %% Contents = int:contents(Mod, Pid), - {ok, Contents} = dbg_iserver:call({raw_contents, Mod, any}), - Win2 = dbg_wx_trace_win:show_code(Win, Mod, Contents), - dbg_wx_trace_win:display(Win,{text, ""}), - Win2. + case dbg_iserver:call({raw_contents, Mod, any}) of + {ok, Contents} -> + Win2 = dbg_wx_trace_win:show_code(Win, Mod, Contents), + dbg_wx_trace_win:display(Win,{text, ""}), + Win2; + not_found -> + dbg_wx_trace_win:show_no_code(Win) + end. gui_update_bindings(Win,Meta) -> Bs = int:meta(Meta, bindings, nostack), |