From 4d904e92e3fe6b839b97d2e57c88e93888d60e5f Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Tue, 2 Nov 2021 19:17:36 +0100
Subject: [PATCH] bump lwjgl, fix crash on wayland with multiple screens

---
 pom.xml                                        | 18 +++++++++++++++++-
 .../gui/rendering/system/window/GLFWWindow.kt  |  9 ++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 43b8bdad6..d5ee99a36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,7 +198,7 @@
         <maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
         <javafx.version>18-ea+4</javafx.version>
         <kotlin.version>1.5.21</kotlin.version>
-        <lwjgl.version>3.2.3</lwjgl.version>
+        <lwjgl.version>3.3.0-SNAPSHOT</lwjgl.version>
     </properties>
 
 
@@ -207,6 +207,17 @@
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
+
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
     </repositories>
 
 
@@ -273,22 +284,27 @@
         <dependency>
             <groupId>org.lwjgl</groupId>
             <artifactId>lwjgl</artifactId>
+            <version>${lwjgl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.lwjgl</groupId>
             <artifactId>lwjgl-glfw</artifactId>
+            <version>${lwjgl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.lwjgl</groupId>
             <artifactId>lwjgl-openal</artifactId>
+            <version>${lwjgl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.lwjgl</groupId>
             <artifactId>lwjgl-opengl</artifactId>
+            <version>${lwjgl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.lwjgl</groupId>
             <artifactId>lwjgl-stb</artifactId>
+            <version>${lwjgl.version}</version>
         </dependency>
         <dependency>
             <groupId>org.lwjgl</groupId>
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt
index 817c68280..45f676b70 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt
@@ -144,9 +144,12 @@ class GLFWWindow(
 
         super.init()
 
-        val videoMode = glfwGetVideoMode(glfwGetPrimaryMonitor())!!
-
-        glfwSetWindowPos(window, (videoMode.width() - size.x) / 2, (videoMode.height() - size.y) / 2)
+        val primaryMonitor = glfwGetPrimaryMonitor()
+        if (primaryMonitor != 0L) {
+            glfwGetVideoMode(primaryMonitor)?.let {
+                glfwSetWindowPos(window, (it.width() - size.x) / 2, (it.height() - size.y) / 2)
+            }
+        }
 
 
         glfwSetKeyCallback(window, this::keyInput)