Merge branch 'master' into feature/update-to-v5.0.1

lluistfc · Apr 29, 2019 · 46bc888 · 46bc888
2 parents a2f5b77 + 9a39ade
commit 46bc888
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/ConnectedRouter.js b/src/ConnectedRouter.js
@@ -35,7 +35,7 @@ const createConnectedRouter = (structure) => {
         } = props.history.location
 
         // If we do time travelling, the location in store is changed but location in history is not changed
-        if (pathnameInHistory !== pathnameInStore || searchInHistory !== searchInStore || hashInHistory !== hashInStore) {
+        if (props.history.action === 'PUSH' && (pathnameInHistory !== pathnameInStore || searchInHistory !== searchInStore || hashInHistory !== hashInStore)) {
           this.inTimeTravelling = true
           // Update history's location to match store's location
           props.history.push({