Merge branch 'dgud/observer/table-viewer-bug/ERL-237/OTP-13845' into maint

* dgud/observer/table-viewer-bug/ERL-237/OTP-13845:
  observer: Fix error msg loop in table viewer

2 files changed, 24 insertions, 6 deletions

diff --git a/lib/observer/src/observer_tv_wx.erl b/lib/observer/src/observer_tv_wx.erl
index 59f6443551..968a7620aa 100644
--- a/lib/observer/src/observer_tv_wx.erl
+++ b/lib/observer/src/observer_tv_wx.erl
@@ -124,6 +124,8 @@ handle_event(#wx{id=Id}, State = #state{node=Node, grid=Grid, opt=Opt0})
 	  end,
     case get_tables2(Node, Opt) of
 	Error = {error, _} ->
+            Id =:= ?ID_MNESIA andalso
+                wxMenuBar:check(observer_wx:get_menubar(), ?ID_ETS, true),
 	    self() ! Error,
 	    {noreply, State};
 	Tables ->
@@ -217,22 +219,32 @@ handle_info(refresh_interval, State = #state{node=Node, grid=Grid, opt=Opt,
             {noreply, State#state{tabs=Tabs}}
     end;
 
-handle_info({active, Node}, State = #state{parent=Parent, grid=Grid, opt=Opt,
+handle_info({active, Node}, State = #state{parent=Parent, grid=Grid, opt=Opt0,
 					   timer=Timer0}) ->
-    Tables = get_tables(Node, Opt),
+    {Tables, Opt} = case Opt0#opt.type =:= mnesia andalso get_tables2(Node, Opt0) of
+                        Ts when is_list(Ts) ->
+                            {Ts, Opt0};
+                        _ -> % false or error getting mnesia tables
+                            Opt1 = Opt0#opt{type=ets},
+                            {get_tables(Node, Opt1), Opt1}
+                    end,
     Tabs = update_grid(Grid, Opt, Tables),
     wxWindow:setFocus(Grid),
     create_menus(Parent, Opt),
     Timer = observer_lib:start_timer(Timer0),
-    {noreply, State#state{node=Node, tabs=Tabs, timer=Timer}};
+    {noreply, State#state{node=Node, tabs=Tabs, timer=Timer, opt=Opt}};
 
 handle_info(not_active, State = #state{timer = Timer0}) ->
     Timer = observer_lib:stop_timer(Timer0),
     {noreply, State#state{timer=Timer}};
 
-handle_info({error, Error}, State) ->
+handle_info({error, Error}, #state{opt=Opt}=State) ->
     handle_error(Error),
-    {noreply, State};
+    case Opt#opt.type of
+        mnesia -> wxMenuBar:check(observer_wx:get_menubar(), ?ID_ETS, true);
+        _ -> ok
+    end,
+    {noreply, State#state{opt=Opt#opt{type=ets}}};
 
 handle_info(_Event, State) ->
     {noreply, State}.
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl
index 301bb4b32f..5732c12006 100644
--- a/lib/observer/src/observer_wx.erl
+++ b/lib/observer/src/observer_wx.erl
@@ -21,7 +21,7 @@
 -behaviour(wx_object).
 
 -export([start/0, stop/0]).
--export([create_menus/2, get_attrib/1, get_tracer/0, get_active_node/0,
+-export([create_menus/2, get_attrib/1, get_tracer/0, get_active_node/0, get_menubar/0,
 	 set_status/1, create_txt_dialog/4, try_rpc/4, return_to_localnode/2]).
 
 -export([init/1, handle_event/2, handle_cast/2, terminate/2, code_change/3,
@@ -94,6 +94,9 @@ get_tracer() ->
 get_active_node() ->
     wx_object:call(observer, get_active_node).
 
+get_menubar() ->
+    wx_object:call(observer, get_menubar).
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 init(_Args) ->
@@ -391,6 +394,9 @@ handle_call(get_tracer, _From, State=#state{trace_panel=TraceP}) ->
 handle_call(get_active_node, _From, State=#state{node=Node}) ->
     {reply, Node, State};
 
+handle_call(get_menubar, _From, State=#state{menubar=MenuBar}) ->
+    {reply, MenuBar, State};
+
 handle_call(stop, From, State) ->
     stop_servers(State),
     {noreply, State#state{reply_to=From}};