From e457826cdc38f463e36f4e7244c8332ab6449166 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Wed, 5 Feb 2014 15:45:15 +0100
Subject: [PATCH] Cluster: check that a MF is in progress in
 manualFailoverCheckTimeout().

Otherwise it is always detected as a manual failover timed out.
---
 src/cluster.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cluster.c b/src/cluster.c
index faa0eebc0..cf835f417 100644
--- a/src/cluster.c
+++ b/src/cluster.c
@@ -2299,7 +2299,7 @@ void resetManualFailover(void) {
 
 /* If a manual failover timed out, abort it. */
 void manualFailoverCheckTimeout(void) {
-    if (server.cluster->mf_end < mstime()) {
+    if (server.cluster->mf_end && server.cluster->mf_end < mstime()) {
         redisLog(REDIS_WARNING,"Manual failover timed out.");
         resetManualFailover();
     }