Backport 5735f418aa44 (Merge of bug24944; GM: 'DOWN' messages can overtake catchups)

1 files changed, 7 insertions, 3 deletions

diff --git a/src/gm.erl b/src/gm.erl
index ba642a8d..eb93e4c4 100644
--- a/src/gm.erl
+++ b/src/gm.erl
@@ -698,9 +698,13 @@ terminate(Reason, State = #state { module        = Module,
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.
 
-prioritise_info(flush,                                   _State) -> 1;
-prioritise_info({'DOWN', _MRef, process, _Pid, _Reason}, _State) -> 1;
-prioritise_info(_                                      , _State) -> 0.
+prioritise_info(flush, _State) ->
+    1;
+prioritise_info({'DOWN', _MRef, process, _Pid, _Reason},
+                #state { members_state = MS }) when MS /= undefined ->
+    1;
+prioritise_info(_, _State) ->
+    0.
 
 
 handle_msg(check_neighbours, State) ->