steamcompmgr: Always shutdown before wlserver

brain-anti-freeze · Apr 10, 2024 · 39f2779 · 39f2779
1 parent b93b576
commit 39f2779
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
@@ -6047,7 +6047,7 @@ steamcompmgr_exit(void)
     gamescope::IBackend::Set( nullptr );
 
     wlserver_lock();
-    wlserver_force_shutdown();
+    wlserver_shutdown();
     wlserver_unlock(false);
 
 	pthread_exit(NULL);

diff --git a/src/wlserver.cpp b/src/wlserver.cpp
@@ -1725,6 +1725,7 @@ void wlserver_unlock(bool flush)
 extern std::mutex g_SteamCompMgrXWaylandServerMutex;
 
 static int g_wlserverNudgePipe[2] = {-1, -1};
+static std::atomic<bool> g_bShutdownWLServer{ false };
 
 void wlserver_run(void)
 {
@@ -1747,7 +1748,8 @@ void wlserver_run(void)
         },
     };
 
-	while ( g_bRun ) {
+	while ( !g_bShutdownWLServer )
+	{
 		int ret = poll( pollfds, 2, -1 );
 
 		if ( ret < 0 ) {
@@ -1798,10 +1800,12 @@ void wlserver_run(void)
 	wlserver_unlock(false);
 }
 
-void wlserver_force_shutdown()
+void wlserver_shutdown()
 {
     assert( wlserver_is_lock_held() );
 
+	g_bShutdownWLServer = true;
+
     if (wlserver.display)
     {
         if ( write( g_wlserverNudgePipe[ 1 ], "\n", 1 ) < 0 )

diff --git a/src/wlserver.hpp b/src/wlserver.hpp
@@ -287,7 +287,7 @@ void wlserver_presentation_feedback_discard( struct wlr_surface *surface, std::v
 void wlserver_past_present_timing( struct wlr_surface *surface, uint32_t present_id, uint64_t desired_present_time, uint64_t actual_present_time, uint64_t earliest_present_time, uint64_t present_margin );
 void wlserver_refresh_cycle( struct wlr_surface *surface, uint64_t refresh_cycle );
 
-void wlserver_force_shutdown();
+void wlserver_shutdown();
 
 void wlserver_send_gamescope_control( wl_resource *control );