diff options
author | Hans Bolinder <[email protected]> | 2016-02-17 09:30:16 +0100 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2016-02-17 09:30:16 +0100 |
commit | 05a24fed7539f861c7d725829acb196a3991923c (patch) | |
tree | d55270dbf9cb24ed868e49a090b52431fb105cd3 /lib/debugger/src/dbg_wx_trace.erl | |
parent | 245f3cc7adc063fc131b051a73237a7e9fcf8524 (diff) | |
parent | 0d5820c44dde5875d322a84eab6ce4227fe19bec (diff) | |
download | otp-05a24fed7539f861c7d725829acb196a3991923c.tar.gz otp-05a24fed7539f861c7d725829acb196a3991923c.tar.bz2 otp-05a24fed7539f861c7d725829acb196a3991923c.zip |
Merge branch 'maint'
* maint:
xmerl: Remove 'no_return' Dialyzer warnings
xmerl: Add suppression of Dialyzer warnings
eunit: Add suppression of Dialyzer warnings
debugger: Add suppression of Dialyzer warnings
kernel: Add suppression of Dialyzer warnings
mnesia: Add suppression of Dialyzer warnings
observer: Add suppression of Dialyzer warnings
runtime_tools: Add suppression of Dialyzer warnings
stdlib: Add suppression of Dialyzer warnings
test_server: Add suppression of Dialyzer warnings
tools: Add suppression of Dialyzer warnings
Conflicts:
lib/stdlib/src/erl_lint.erl
lib/stdlib/src/otp_internal.erl
Diffstat (limited to 'lib/debugger/src/dbg_wx_trace.erl')
-rw-r--r-- | lib/debugger/src/dbg_wx_trace.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl index 5fd1519ba0..f9c60f9b72 100644 --- a/lib/debugger/src/dbg_wx_trace.erl +++ b/lib/debugger/src/dbg_wx_trace.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2014. All Rights Reserved. +%% Copyright Ericsson AB 2008-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -811,7 +811,7 @@ gui_show_module(Win, Mod, Line, Mod, _Pid, How) -> dbg_wx_trace_win:mark_line(Win, Line, How); gui_show_module(Win, Mod, Line, _Cm, Pid, How) -> Win2 = case dbg_wx_trace_win:is_shown(Win, Mod) of - {true, Win3} -> Win3; + %% {true, Win3} -> Win3; false -> gui_load_module(Win, Mod, Pid) end, dbg_wx_trace_win:mark_line(Win2, Line, How). |