From e92048c85b8ab4b414264ddd23f40fcdfb277b07 Mon Sep 17 00:00:00 2001
From: Francois Belair <razoric480@gmail.com>
Date: Mon, 11 May 2020 00:34:58 -0400
Subject: [PATCH] Fix scene_file config; fix launch failure

- scene_file used an unnecessary call to path.relative that prevented
proper use. Fixes #176
- If the debugger failed to launch, it would fail on future attempts.
---
 src/debugger/server_controller.ts | 47 ++++++++++++++-----------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/debugger/server_controller.ts b/src/debugger/server_controller.ts
index 5b0c098..424d16d 100644
--- a/src/debugger/server_controller.ts
+++ b/src/debugger/server_controller.ts
@@ -95,6 +95,26 @@ export class ServerController {
 	) {
 		this.debug_data = debug_data;
 
+		if (launch_instance) {
+			let godot_path: string = utils.get_configuration("editor_path", "godot");
+			let executable_line = `"${godot_path}" --path "${project_path}" --remote-debug ${address}:${port}`;
+			if (launch_scene) {
+				let filename = "";
+				if (scene_file) {
+					filename = scene_file;
+				} else {
+					filename = window.activeTextEditor.document.fileName;
+				}
+				executable_line += ` "${filename}"`;
+			}
+			executable_line += this.breakpoint_string(
+				debug_data.get_all_breakpoints(),
+				project_path
+			);
+			let godot_exec = cp.exec(executable_line);
+			this.godot_pid = godot_exec.pid;
+		}
+
 		this.server = net.createServer((socket) => {
 			this.socket = socket;
 
@@ -137,32 +157,6 @@ export class ServerController {
 		});
 
 		this.server.listen(port, address);
-
-		if (launch_instance) {
-			let godot_path: string = utils.get_configuration("editor_path", "godot");
-			let executable_line = `"${godot_path}" --path "${project_path}" --remote-debug ${address}:${port}`;
-			if (launch_scene) {
-				let filename = "";
-				if (scene_file) {
-					filename = scene_file;
-				} else {
-					filename = window.activeTextEditor.document.fileName;
-				}
-				if (path.extname(filename).toLowerCase() === ".tscn") {
-					executable_line += ` ${path.relative(project_path, filename)}`;
-				} else {
-					window.showErrorMessage("Active file is not a TSCN file.");
-					Mediator.notify("stop");
-					return;
-				}
-			}
-			executable_line += this.breakpoint_string(
-				debug_data.get_all_breakpoints(),
-				project_path
-			);
-			let godot_exec = cp.exec(executable_line);
-			this.godot_pid = godot_exec.pid;
-		}
 	}
 
 	public step() {
@@ -179,6 +173,7 @@ export class ServerController {
 			this.server.close();
 			this.server = undefined;
 		});
+
 		if (this.godot_pid) {
 			TERMINATE(this.godot_pid, (error: string | undefined) => {
 				if (error) {