Skip to content

Commit

Permalink
Merge branch 'main' into franknoirot/adhoc/dont-redirect-unless-setti…
Browse files Browse the repository at this point in the history
…ngs-loaded
  • Loading branch information
franknoirot authored Feb 24, 2025
2 parents 69d66e9 + 253a791 commit 16b9b78
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion src/machines/settingsMachine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,16 @@ export const settingsMachine = setup({
src: 'loadUserSettings',
onDone: {
target: 'idle',
actions: 'setAllSettings',
actions: [
'setAllSettings',
'setThemeClass',
'setEngineTheme',
'setClientSideSceneUnits',
'setThemeColor',
'setClientTheme',
'setAllowOrbitInSketchMode',
'sendThemeToWatcher',
],
},
onError: {
target: 'idle',
Expand All @@ -561,8 +570,14 @@ export const settingsMachine = setup({
target: 'idle',
actions: [
'setAllSettings',
'setThemeClass',
'setEngineTheme',
'setClientSideSceneUnits',
'setThemeColor',
'Execute AST',
'setClientTheme',
'setAllowOrbitInSketchMode',
'sendThemeToWatcher',
sendTo('registerCommands', { type: 'update' }),
],
},
Expand Down

0 comments on commit 16b9b78

Please sign in to comment.