diff options
| author | Dan Gudmundsson <[email protected]> | 2011-03-02 11:24:07 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2011-03-02 11:24:07 +0100 |
| commit | 29b1f35b3242ff80ddee14a833d5f3dcc4de9f65 (patch) | |
| tree | a410271358f5fc357e0e4b1053893e9f915f35ca /lib/wx/src | |
| parent | cdf46e658a3a11b97f6179c0d416dc8f2e975509 (diff) | |
| parent | 1bf0af6284aca47a6b3a823c4dd682e8fb8d4135 (diff) | |
| download | otp-29b1f35b3242ff80ddee14a833d5f3dcc4de9f65.tar.gz otp-29b1f35b3242ff80ddee14a833d5f3dcc4de9f65.tar.bz2 otp-29b1f35b3242ff80ddee14a833d5f3dcc4de9f65.zip | |
Merge branch 'dgud/wx/unload-driver/OTP-9080' into dev
* dgud/wx/unload-driver/OTP-9080:
Fix bad string copy during initialization
Fix start args
Fixed coredump when graphics could not be initiated
Diffstat (limited to 'lib/wx/src')
| -rw-r--r-- | lib/wx/src/wxe_master.erl | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/wx/src/wxe_master.erl b/lib/wx/src/wxe_master.erl index d8592c133b..9efe59054c 100644 --- a/lib/wx/src/wxe_master.erl +++ b/lib/wx/src/wxe_master.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -128,19 +128,19 @@ init([]) -> process_flag(trap_exit, true), DriverWithArgs = DriverName ++ " " ++ code:priv_dir(wx) ++ [0], - case catch open_port({spawn, DriverWithArgs},[binary]) of - {'EXIT', Err} -> - erlang:error({open_port,Err}); - Port -> - wx_debug_info = ets:new(wx_debug_info, [named_table]), - wx_non_consts = ets:new(wx_non_consts, [named_table]), - true = ets:insert(wx_debug_info, wxdebug_table()), - spawn_link(fun() -> debug_ping(Port) end), - receive - {wx_consts, List} -> - true = ets:insert(wx_non_consts, List) - end, - {ok, #state{cb_port=Port, driver=DriverName, users=gb_sets:empty()}} + try + Port = open_port({spawn, DriverWithArgs},[binary]), + wx_debug_info = ets:new(wx_debug_info, [named_table]), + wx_non_consts = ets:new(wx_non_consts, [named_table]), + true = ets:insert(wx_debug_info, wxdebug_table()), + spawn_link(fun() -> debug_ping(Port) end), + receive + {wx_consts, List} -> + true = ets:insert(wx_non_consts, List) + end, + {ok, #state{cb_port=Port, driver=DriverName, users=gb_sets:empty()}} + catch _:Err -> + error({Err, "Could not initiate graphics"}) end. %%-------------------------------------------------------------------- |