diff options
author | Siri Hansen <[email protected]> | 2017-01-26 11:20:20 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2017-01-26 11:20:20 +0100 |
commit | bcb9300382459deea91038f4847ef3fa70137f11 (patch) | |
tree | 954b9fbf642108082684136b32b71b8a8d925103 /lib/observer/src/observer_tv_wx.erl | |
parent | 9153f7a734ddd9ca47b339cb19b8d44ed79ade0f (diff) | |
parent | 15dd52f771314b6eade47314afcd8b3206c694b1 (diff) | |
download | otp-bcb9300382459deea91038f4847ef3fa70137f11.tar.gz otp-bcb9300382459deea91038f4847ef3fa70137f11.tar.bz2 otp-bcb9300382459deea91038f4847ef3fa70137f11.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/observer/src/observer_tv_wx.erl')
-rw-r--r-- | lib/observer/src/observer_tv_wx.erl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/observer/src/observer_tv_wx.erl b/lib/observer/src/observer_tv_wx.erl index 968a7620aa..4356cb890c 100644 --- a/lib/observer/src/observer_tv_wx.erl +++ b/lib/observer/src/observer_tv_wx.erl @@ -238,8 +238,9 @@ handle_info(not_active, State = #state{timer = Timer0}) -> Timer = observer_lib:stop_timer(Timer0), {noreply, State#state{timer=Timer}}; -handle_info({error, Error}, #state{opt=Opt}=State) -> - handle_error(Error), +handle_info({error, Error}, #state{panel=Panel,opt=Opt}=State) -> + Str = io_lib:format("ERROR: ~s~n",[Error]), + observer_lib:display_info_dialog(Panel,Str), case Opt#opt.type of mnesia -> wxMenuBar:check(observer_wx:get_menubar(), ?ID_ETS, true); _ -> ok @@ -365,10 +366,6 @@ list_to_strings([A]) -> integer_to_list(A); list_to_strings([A|B]) -> integer_to_list(A) ++ " ," ++ list_to_strings(B). -handle_error(Foo) -> - Str = io_lib:format("ERROR: ~s~n",[Foo]), - observer_lib:display_info_dialog(Str). - update_grid(Grid, Opt, Tables) -> wx:batch(fun() -> update_grid2(Grid, Opt, Tables) end). update_grid2(Grid, #opt{sort_key=Sort,sort_incr=Dir}, Tables) -> |