diff options
| author | Dan Gudmundsson <[email protected]> | 2015-08-26 13:22:35 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-08-26 13:22:35 +0200 |
| commit | c13f823e9f7f94d11261e09c3fccb41bc511117a (patch) | |
| tree | 5e6c9edf4c6b386b011af92bee7dd65da9cdef1d /lib/debugger/src | |
| parent | 5e775a5a61f4f4549fda1ad0d9d428d0977217af (diff) | |
| parent | bfdc9f97f1738d072d09b98a8980b0b59639db0b (diff) | |
| download | otp-c13f823e9f7f94d11261e09c3fccb41bc511117a.tar.gz otp-c13f823e9f7f94d11261e09c3fccb41bc511117a.tar.bz2 otp-c13f823e9f7f94d11261e09c3fccb41bc511117a.zip | |
Merge branch 'maint'
* maint:
Optimize zip:unzip/2 when uncompressing to memory
wx: Fix assert log test
debugger: Fix broken debugger:quick/3 start
Remove erlang:now() and random usage in tests
Diffstat (limited to 'lib/debugger/src')
| -rw-r--r-- | lib/debugger/src/dbg_wx_trace.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/debugger/src/dbg_wx_trace.erl b/lib/debugger/src/dbg_wx_trace.erl index b246c71284..5fd1519ba0 100644 --- a/lib/debugger/src/dbg_wx_trace.erl +++ b/lib/debugger/src/dbg_wx_trace.erl @@ -73,6 +73,10 @@ start(Pid, TraceWin, BackTrace) -> start(Pid, TraceWin, BackTrace, Strings) -> case whereis(dbg_wx_mon) of + undefined -> + Parent = wx:new(), + Env = wx:get_env(), + start(Pid, Env, Parent, TraceWin, BackTrace, Strings); Monitor when is_pid(Monitor) -> Monitor ! {?MODULE, self(), get_env}, receive |