danog/telegram-tt
1
0
Fork 0
mirror of https://github.com/danog/telegram-tt.git synced 2025-01-22 21:31:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Dev] TeactN: Assert when setting global asynchronously (follow-up)

Browse Source
This commit is contained in:
Alexander Zinchuk 2022-04-09 02:53:44 +02:00
parent 91c2015052
commit 7d09556e4c
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/global/init.ts
View File

@ -6,10 +6,7 @@ import { cloneDeep } from '../util/iteratees';
initCache(); initCache();
addActionHandler('init', (global) => { addActionHandler('init', () => {
const initial = cloneDeep(INITIAL_STATE); const initial = cloneDeep(INITIAL_STATE);
return { return loadCache(initial) || initial;
...global,
...(loadCache(initial) || initial),
};
}); });

2
src/lib/teact/teactn.tsx
View File

@ -71,7 +71,7 @@ function runCallbacks(forceOnHeavyAnimation = false) {
export function setGlobal(newGlobal?: GlobalState, options?: ActionOptions) { export function setGlobal(newGlobal?: GlobalState, options?: ActionOptions) {
if (typeof newGlobal === 'object' && newGlobal !== currentGlobal) { if (typeof newGlobal === 'object' && newGlobal !== currentGlobal) {
if (DEBUG) { if (DEBUG) {
if (newGlobal.DEBUG_id !== DEBUG_currentGlobalId) { if (newGlobal.DEBUG_id && newGlobal.DEBUG_id !== DEBUG_currentGlobalId) {
throw new Error('[TeactN.setGlobal] Attempt to set an outdated global'); throw new Error('[TeactN.setGlobal] Attempt to set an outdated global');
} }
} }