diff --git a/examples/swapchain.zig b/examples/swapchain.zig
index cf42f80..cda8305 100644
--- a/examples/swapchain.zig
+++ b/examples/swapchain.zig
@@ -1,6 +1,5 @@
 const std = @import("std");
 const vk = @import("vulkan");
-const c = @import("c.zig");
 const GraphicsContext = @import("graphics-context.zig").GraphicsContext;
 const Allocator = std.mem.Allocator;
 
@@ -99,7 +98,15 @@ pub const Swapchain = struct {
         self.gc.vkd.destroySemaphore(self.gc.dev, self.next_image_acquired, null);
     }
 
+    pub fn waitForAllFences(self: Swapchain) !void {
+        for (self.swap_images) |si| {
+            // Any error result is fatal anyway
+            _ = try self.gc.vkd.waitForFences(self.gc.dev, 1, @ptrCast([*]const vk.Fence, &si.frame_fence), vk.TRUE, std.math.maxInt(u64));
+        }
+    }
+
     pub fn deinit(self: Swapchain) void {
+        self.waitForAllFences() catch return;
         self.deinitExceptSwapchain();
         self.gc.vkd.destroySwapchainKHR(self.gc.dev, self.handle, null);
     }
@@ -229,10 +236,6 @@ const SwapImage = struct {
     }
 
     fn deinit(self: SwapImage, gc: *const GraphicsContext) void {
-        // Ignore any error (and the result), and still try to delete the other resources.
-        // If this errors, the error is likely to be triggered elsewhere anyway.
-        const result = gc.vkd.waitForFences(gc.dev, 1, @ptrCast([*]const vk.Fence, &self.frame_fence), vk.TRUE, std.math.maxInt(u64));
-
         gc.vkd.destroyImageView(gc.dev, self.view, null);
         gc.vkd.destroySemaphore(gc.dev, self.image_acquired, null);
         gc.vkd.destroySemaphore(gc.dev, self.render_finished, null);
diff --git a/examples/triangle.zig b/examples/triangle.zig
index 0da5c4f..b10ad94 100644
--- a/examples/triangle.zig
+++ b/examples/triangle.zig
@@ -153,8 +153,9 @@ pub fn main() !void {
         c.glfwSwapBuffers(window);
         c.glfwPollEvents();
 
-        try gc.vkd.queueWaitIdle(gc.graphics_queue.handle);
     }
+
+    try swapchain.waitForAllFences();
 }
 
 fn uploadVertices(gc: *const GraphicsContext, pool: vk.CommandPool, buffer: vk.Buffer, memory: vk.DeviceMemory) !void {