Skip to content

Commit bfb11a5

Browse files
Also check for different host
1 parent 4df007f commit bfb11a5

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

packages/firestore/lite/src/api/database.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,16 +318,17 @@ export function useFirestoreEmulator(
318318
port: number
319319
): void {
320320
firestore = cast(firestore, FirebaseFirestore);
321+
const settings = firestore._getSettings();
321322

322-
if (firestore._getSettings().host !== DEFAULT_HOST) {
323+
if (settings.host !== DEFAULT_HOST && settings.host !== host) {
323324
logWarn(
324325
'Host has been set in both settings() and useEmulator(), emulator host ' +
325326
'will be used'
326327
);
327328
}
328329

329330
firestore._setSettings({
330-
...firestore._getSettings(),
331+
...settings,
331332
host: `${host}:${port}`,
332333
ssl: false
333334
});

0 commit comments

Comments
 (0)