Prevent unnecessary merge requests on intermittent network shares

* Fixes #4118
keepassxreboot · Jan 11, 2020 · cba8947 · cba8947
1 parent 39a7ce5
commit cba8947
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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;
     });
 }