Skip to content

Commit f2b9795

Browse files
committed
fix: ignore stale copy-on-select defaults
1 parent eadb169 commit f2b9795

2 files changed

Lines changed: 7 additions & 15 deletions

File tree

packages/web/src/features/settings/components/settings-page.test.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,9 +1108,7 @@ describe("SettingsPage", () => {
11081108
});
11091109

11101110
await act(async () => {
1111-
resolveSettingsGet?.({
1112-
"appearance.terminalCopyOnSelect": false,
1113-
});
1111+
resolveSettingsGet?.({});
11141112
await settingsGetPromise;
11151113
});
11161114

packages/web/src/features/settings/components/settings-page.tsx

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -240,18 +240,12 @@ export function SettingsPage() {
240240
setTerminalRendererState(settings["appearance.terminalRenderer"]);
241241
}
242242
}
243-
const resolvedTerminalCopyOnSelect = resolveTerminalCopyOnSelectSetting(settings);
244-
if (typeof settings["appearance.terminalCopyOnSelect"] === "boolean") {
245-
if (
246-
appearanceSelectionVersionRef.current.terminalCopyOnSelect ===
247-
appearanceSelectionVersionAtRequestStart.terminalCopyOnSelect
248-
) {
249-
setTerminalCopyOnSelectState(settings["appearance.terminalCopyOnSelect"]);
250-
setTerminalPreferences({
251-
copyOnSelect: resolvedTerminalCopyOnSelect,
252-
});
253-
}
254-
} else {
243+
if (
244+
appearanceSelectionVersionRef.current.terminalCopyOnSelect ===
245+
appearanceSelectionVersionAtRequestStart.terminalCopyOnSelect
246+
) {
247+
const resolvedTerminalCopyOnSelect = resolveTerminalCopyOnSelectSetting(settings);
248+
setTerminalCopyOnSelectState(resolvedTerminalCopyOnSelect);
255249
setTerminalPreferences({
256250
copyOnSelect: resolvedTerminalCopyOnSelect,
257251
});

0 commit comments

Comments
 (0)