mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-10-21 20:21:38 +00:00
Use SerializationService as a fallback for when patch application fails (#1030)
This commit is contained in:
parent
59e36491a5
commit
80a381dbb1
26 changed files with 793 additions and 108 deletions
|
|
@ -181,6 +181,14 @@ function SettingsPage:render()
|
|||
layoutOrder = layoutIncrement(),
|
||||
}),
|
||||
|
||||
EnableSyncFallback = e(Setting, {
|
||||
id = "enableSyncFallback",
|
||||
name = "Enable Sync Fallback",
|
||||
description = "Whether Instances that fail to sync are remade as a fallback. If this is enabled, Instances may be destroyed and remade when syncing.",
|
||||
transparency = self.props.transparency,
|
||||
layoutOrder = layoutIncrement(),
|
||||
}),
|
||||
|
||||
CheckForUpdates = e(Setting, {
|
||||
id = "checkForUpdates",
|
||||
name = "Check For Updates",
|
||||
|
|
|
|||
|
|
@ -595,13 +595,13 @@ function App:startSession()
|
|||
twoWaySync = Settings:get("twoWaySync"),
|
||||
})
|
||||
|
||||
self.cleanupPrecommit = serveSession.__reconciler:hookPrecommit(function(patch, instanceMap)
|
||||
self.cleanupPrecommit = serveSession:hookPrecommit(function(patch, instanceMap)
|
||||
-- Build new tree for patch
|
||||
self:setState({
|
||||
patchTree = PatchTree.build(patch, instanceMap, { "Property", "Old", "New" }),
|
||||
})
|
||||
end)
|
||||
self.cleanupPostcommit = serveSession.__reconciler:hookPostcommit(function(patch, instanceMap, unappliedPatch)
|
||||
self.cleanupPostcommit = serveSession:hookPostcommit(function(patch, instanceMap, unappliedPatch)
|
||||
-- Update tree with unapplied metadata
|
||||
self:setState(function(prevState)
|
||||
return {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue