From 525a974e3aa9e789c80e475d8684a258e5b44bcd Mon Sep 17 00:00:00 2001
From: Mitchell Syer <Mitchellptbo@gmail.com>
Date: Mon, 19 Feb 2024 11:06:20 -0500
Subject: [PATCH] Start Server after routes are defined (#881)

* Start Server after routes are defined

* Separate events
---
 .../suwayomi/tachidesk/server/JavalinSetup.kt    | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt
index d7cf7557..7fda009c 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt
@@ -106,13 +106,15 @@ object JavalinSetup {
                         handler.handle(ctx)
                     }
                 }
-            }.events { event ->
-                event.serverStarted {
-                    if (serverConfig.initialOpenInBrowserEnabled.value) {
-                        Browser.openInBrowser()
-                    }
+            }
+
+        app.events { event ->
+            event.serverStarted {
+                if (serverConfig.initialOpenInBrowserEnabled.value) {
+                    Browser.openInBrowser()
                 }
-            }.start()
+            }
+        }
 
         // when JVM is prompted to shutdown, stop javalin gracefully
         Runtime.getRuntime().addShutdownHook(
@@ -150,6 +152,8 @@ object JavalinSetup {
                 GraphQL.defineEndpoints()
             }
         }
+
+        app.start()
     }
 
     private fun getOpenApiOptions(): OpenApiOptions {