Merge branch 'maint'

Conflicts:
	lib/observer/src/crashdump_viewer.erl

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/observer/src/cdv_detail_wx.erl b/lib/observer/src/cdv_detail_wx.erl
index f6d282638a..6c4739042b 100644
--- a/lib/observer/src/cdv_detail_wx.erl
+++ b/lib/observer/src/cdv_detail_wx.erl
@@ -48,6 +48,7 @@ init([Id, Data, ParentFrame, Callback, App, Parent]) ->
     display_progress(ParentFrame,App),
     case Callback:get_details(Id, Data) of
 	{ok,Details} ->
+            display_progress_pulse(Callback,Id),
 	    init(Id,ParentFrame,Callback,App,Parent,Details);
 	{yes_no, Info, Fun} ->
             destroy_progress(App),
@@ -69,8 +70,16 @@ display_progress(ParentFrame,cdv) ->
                                          "Reading data");
 display_progress(_,_) ->
     ok.
+
+%% Display pulse while creating process detail page with much data
+display_progress_pulse(cdv_proc_cb,Pid) ->
+    observer_lib:report_progress({ok,"Displaying data for "++Pid}),
+    observer_lib:report_progress({ok,start_pulse});
+display_progress_pulse(_,_) ->
+    ok.
+
 destroy_progress(cdv) ->
-    observer_lib:destroy_progress_dialog();
+    observer_lib:sync_destroy_progress_dialog();
 destroy_progress(_) ->
     ok.