From cba8947ee8a22e9abd801df78e3ff0e6b58fb77b Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Fri, 10 Jan 2020 19:09:46 -0500
Subject: [PATCH] Prevent unnecessary merge requests on intermittent network
 shares

* Fixes #4118
---
 src/core/FileWatcher.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/FileWatcher.cpp b/src/core/FileWatcher.cpp
index fb8e95128..0bc5e3444 100644
--- a/src/core/FileWatcher.cpp
+++ b/src/core/FileWatcher.cpp
@@ -143,7 +143,9 @@ QByteArray FileWatcher::calculateChecksum()
             }
             return hash.result();
         }
-        return {};
+        // If we fail to open the file return the last known checksum, this
+        // prevents unnecessary merge requests on intermittent network shares
+        return m_fileChecksum;
     });
 }