Merge changes when resuming

2019-04-09 01:51:31 +02:00
parent f5de7903e7
commit 2812baccf9
1 changed files with 9 additions and 3 deletions
--- a/app/src/actions/Tree.ts
+++ b/app/src/actions/Tree.ts
@@ -68,11 +68,17 @@ export const togglePause = (tree?: q.Tree<TopicViewModel>) => (dispatch: Dispatc
    dispatch(globalActions.showNotification('Applying recorded changes.'))
  }

+  // Allow for notification to be displayed
+  setTimeout(() => {
+    tree && tree.applyUnmergedChanges()
+    if (paused && changes > 0) {
+      dispatch(globalActions.showNotification(`Sucessfully applied ${changes} changes.`))
+    }
+  }, 50)
+
  dispatch({
    type: paused ? ActionTypes.TREE_RESUME_UPDATES : ActionTypes.TREE_PAUSE_UPDATES,
  })

-  if (paused && changes > 0) {
-    dispatch(globalActions.showNotification(`Sucessfully applied ${changes} changes.`))
-  }
+
 }