diff options
| author |  Dylan Conway <dylan.conway567@gmail.com>
| 2023-10-14 12:58:30 -0700 |
|---|---|---|
| committer | Dylan Conway <dylan.conway567@gmail.com>
| 2023-10-14 12:58:30 -0700 |
| commit | f9add8b6bea4df3cdbd56a21f17e4cab1a854e4e (patch) | |
| tree | 8e5306104d81c67b771181337bba02cd9ec39453 /src/bun.js/node | |
| parent | 81a1a58d66c598ea35c42453d0ba4c6341a940fc (diff) | |
| parent | 9b5e66453b0879ed77b71dcdbe50e4efa184261e (diff) | |
| download | bun-sdl.tar.gz bun-sdl.tar.zst bun-sdl.zip | |
Merge branch 'main' into sdlsdl
Diffstat (limited to 'src/bun.js/node')
| -rw-r--r-- | src/bun.js/node/node_fs_binding.zig | 2 | ||||
| -rw-r--r-- | src/bun.js/node/node_fs_stat_watcher.zig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bun.js/node/node_fs_binding.zig b/src/bun.js/node/node_fs_binding.zig index db4d79fc9..967acbe53 100644 --- a/src/bun.js/node/node_fs_binding.zig +++ b/src/bun.js/node/node_fs_binding.zig @@ -67,7 +67,7 @@ fn callSync(comptime FunctionEnum: NodeFSFunctionEnum) NodeFSFunction { args, comptime Flavor.sync, ); - + switch (result) { .err => |err| { globalObject.throwValue(JSC.JSValue.c(err.toJS(globalObject))); diff --git a/src/bun.js/node/node_fs_stat_watcher.zig b/src/bun.js/node/node_fs_stat_watcher.zig index 3bf262f07..158a08ff7 100644 --- a/src/bun.js/node/node_fs_stat_watcher.zig +++ b/src/bun.js/node/node_fs_stat_watcher.zig @@ -97,7 +97,7 @@ pub const StatWatcherScheduler = struct { prev = next; } else { if (this.head.load(.Monotonic) == null) { - this.timer.?.deinit(); + this.timer.?.deinit(false); this.timer = null; // The scheduler is not deinit here, but it will get reused. } |