1 files changed, 7 insertions, 8 deletions
diff --git a/src/wayclock.cc b/src/wayclock.cc
index 2d3f9c7..348b122 100644
--- a/src/wayclock.cc
+++ b/src/wayclock.cc
@@ -40,18 +40,17 @@ void handle(struct eventloop_s* loop, struct event_s* event) {
 }
 
 int main() {
-  struct graphics_s graphics;
-  if (wayc_graphics_init(&graphics) != GRAPHICS_ERROR_NONE)
-    wayc_panic("Failed to initialize graphics");
-
   struct eventloop_s loop;
-  if (wayc_eventloop_init(&loop, handle) != EVENTLOOP_ERROR_NONE) {
-    wayc_graphics_deinit(&graphics);
+  if (wayc_eventloop_init(&loop, handle) != EVENTLOOP_ERROR_NONE)
     wayc_panic("Failed to initialize event loop");
-  }
+
+  struct graphics_s graphics;
+  if (wayc_graphics_init(&graphics, &loop.state) != GRAPHICS_ERROR_NONE)
+    wayc_panic("Failed to initialize graphics");
 
   struct window_s window;
   if (wayc_window_init(&window, WAYC_APP_NAME, &loop) != WINDOW_ERROR_NONE) {
+    wayc_graphics_deinit(&graphics);
     wayc_eventloop_deinit(&loop);
     wayc_panic("Failed to initialize window");
   }
@@ -62,7 +61,7 @@ int main() {
   while (wayc_eventloop_running(&loop)) wayc_eventloop_update(&loop);
 
   wayc_window_deinit(&window);
-  wayc_eventloop_deinit(&loop);
   wayc_graphics_deinit(&graphics);
+  wayc_eventloop_deinit(&loop);
   return 0;
 }
 \ No newline at end of file