Fix: DisplayContextSelection read violation (#547)

microsoft · Nov 2, 2024 · 0edb602 · 0edb602
1 parent 9aefbec
commit 0edb602
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/media/editor/state.ts b/media/editor/state.ts
@@ -35,11 +35,11 @@ const acquireVsCodeApi: () => {
 export const vscode = acquireVsCodeApi?.();
 
 export const setWebviewState = (key: string, value: unknown) => {
-	vscode.setState?.({ ...vscode.getState(), [key]: value });
+	vscode.setState?.({ ...(vscode.getState?.() ?? {}), [key]: value });
 };
 
 export const getWebviewState = <T>(key: string, defaultValue: T): T => {
-	return vscode.getState?.()[key] ?? defaultValue;
+	return (vscode.getState?.() ?? {})[key] ?? defaultValue;
 };
 
 type HandlerFn = (message: ToWebviewMessage) => Promise<FromWebviewMessage> | undefined;