Skip to content

Commit 8e27845

Browse files
committed
fix: don't overwrite existing props
1 parent ecae379 commit 8e27845

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

electron/main/sge/socket/connect.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ export const connect = async (
1919
timeout: 5000,
2020
};
2121

22-
let mergedOptions = merge(defaultOptions, connectOptions);
22+
let mergedOptions = merge({}, defaultOptions, connectOptions);
2323

2424
const { host, port } = mergedOptions;
2525

2626
const certToTrust = await getTrustedTlsCertificate(mergedOptions);
2727

2828
mergedOptions = merge(
29+
{},
2930
mergedOptions,
3031
createSelfSignedConnectOptions({
3132
certToTrust,

0 commit comments

Comments
 (0)