Skip to content

Commit 48f485e

Browse files
committed
Give docker-compose setting priority over server one (fix intersystems-community#898)
1 parent dc35116 commit 48f485e

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/api/index.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,11 @@ export class AtelierAPI {
176176
let serverName = workspaceFolderName.toLowerCase();
177177
if (config("intersystems.servers").has(serverName)) {
178178
this.externalServer = true;
179-
} else if (conn.server && config("intersystems.servers", workspaceFolderName).has(conn.server)) {
179+
} else if (
180+
!conn["docker-compose"] &&
181+
conn.server &&
182+
config("intersystems.servers", workspaceFolderName).has(conn.server)
183+
) {
180184
serverName = conn.server;
181185
} else {
182186
serverName = "";

0 commit comments

Comments
 (0)