Merge pull request supertuxkart#4000 from mstoeckl/wayland-conn-close

deveee · web-flow · commit 9415c61d7506 · 2019-07-12T08:43:06.000+02:00
Close program when Wayland connection hangs up
diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp
@@ -1283,7 +1283,10 @@ bool CIrrDeviceWayland::run()
 {
     os::Timer::tick();
 
-    wl_display_dispatch_pending(m_display);
+    if (wl_display_dispatch_pending(m_display) == -1)
+    {
+	closeDevice();
+    }
 
     for (unsigned int i = 0; i < m_events.size(); i++)
     {

Original file line number	Diff line number	Diff line change
`@@ -1283,7 +1283,10 @@ bool CIrrDeviceWayland::run()`
`1283`	`1283`	`{`
`1284`	`1284`	`os::Timer::tick();`
`1285`	`1285`
`1286`		`- wl_display_dispatch_pending(m_display);`
	`1286`	`+ if (wl_display_dispatch_pending(m_display) == -1)`
	`1287`	`+ {`
	`1288`	`+ closeDevice();`
	`1289`	`+ }`
`1287`	`1290`
`1288`	`1291`	`for (unsigned int i = 0; i < m_events.size(); i++)`
`1289`	`1292`	`{`