neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

fix(terminal): don't error when re-opening existing terminal

Browse source
This commit is contained in:
CJ van den Berg 2026-04-07 18:57:35 +02:00
parent 1937831df5
commit 4766673ead
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/tui/terminal_view.zig
View file

@ -87,6 +87,7 @@ pub fn run_cmd(self: *Self, ctx: command.Context) !void {
var argv_list: std.ArrayListUnmanaged([]const u8) = .empty; var argv_list: std.ArrayListUnmanaged([]const u8) = .empty;
defer argv_list.deinit(self.allocator); defer argv_list.deinit(self.allocator);
var have_cmd = false;
if (argv_msg) |msg| { if (argv_msg) |msg| {
var iter = msg.buf; var iter = msg.buf;
var len = try cbor.decodeArrayHeader(&iter); var len = try cbor.decodeArrayHeader(&iter);
@ -94,6 +95,7 @@ pub fn run_cmd(self: *Self, ctx: command.Context) !void {
var arg: []const u8 = undefined; var arg: []const u8 = undefined;
if (try cbor.matchValue(&iter, cbor.extract(&arg))) if (try cbor.matchValue(&iter, cbor.extract(&arg)))
try argv_list.append(self.allocator, arg); try argv_list.append(self.allocator, arg);
have_cmd = true;
} }
} else { } else {
const default_shell = if (builtin.os.tag == .windows) const default_shell = if (builtin.os.tag == .windows)
@ -110,7 +112,7 @@ pub fn run_cmd(self: *Self, ctx: command.Context) !void {
const rows: u16 = @intCast(@max(24, self.plane.dim_y())); const rows: u16 = @intCast(@max(24, self.plane.dim_y()));
if (global_vt) |*vt| { if (global_vt) |*vt| {
if (!vt.process_exited) { if (!vt.process_exited and have_cmd) {
var msg: std.Io.Writer.Allocating = .init(self.allocator); var msg: std.Io.Writer.Allocating = .init(self.allocator);
defer msg.deinit(); defer msg.deinit();
try msg.writer.writeAll("terminal is already running '"); try msg.writer.writeAll("terminal is already running '");
@ -118,10 +120,9 @@ pub fn run_cmd(self: *Self, ctx: command.Context) !void {
try msg.writer.writeAll("'"); try msg.writer.writeAll("'");
return tp.exit(msg.written()); return tp.exit(msg.written());
} }
vt.deinit(self.allocator); } else {
global_vt = null;
}
try Vt.init(self.allocator, argv_list.items, env, rows, cols, on_exit); try Vt.init(self.allocator, argv_list.items, env, rows, cols, on_exit);
}
self.vt = &global_vt.?; self.vt = &global_vt.?;
if (self.last_cmd) |cmd| { if (self.last_cmd) |cmd| {