@@ -90,10 +90,10 @@ static bool setEnvironmentVars( PipeType pipeChildRead, PipeType pipeChildWrite
9090
9191void taskHeartbeat ()
9292{
93- while ( true ) {
93+ while ( STEAMSHIM_active () ) {
9494 struct steam_shim_common_s pkt;
9595 pkt.cmd = EVT_HEART_BEAT;
96- STEAMSHIM_sendEVT ( &pkt, sizeof ( struct steam_shim_common_s ) );
96+ STEAMSHIM_sendEVT ( &pkt, sizeof ( struct steam_shim_common_s ));
9797 std::this_thread::sleep_for ( std::chrono::milliseconds ( 1000 ) );
9898 }
9999}
@@ -162,9 +162,8 @@ int STEAMSHIM_init( SteamshimOptions *options )
162162void STEAMSHIM_deinit ( void )
163163{
164164 dbgprintf ( " Child deinit.\n " );
165- if ( GPipeWrite != NULLPIPE ) {
165+ if ( GPipeWrite != NULLPIPE )
166166 closePipe ( GPipeWrite );
167- }
168167
169168 if ( GPipeRead != NULLPIPE )
170169 closePipe ( GPipeRead );
@@ -224,7 +223,7 @@ int STEAMSHIM_waitDispatchSync( uint32_t syncIndex )
224223 if ( bytesRead > 0 ) {
225224 cursor += bytesRead;
226225 } else {
227- continue ;
226+ return - 1 ;
228227 }
229228 continue_processing:
230229
@@ -279,7 +278,7 @@ void STEAMSHIM_subscribeEvent( uint32_t id, void *self, STEAMSHIM_evt_handle evt
279278void STEAMSHIM_unsubscribeEvent ( uint32_t id, STEAMSHIM_evt_handle cb )
280279{
281280 assert ( id >= EVT_BEGIN && id < EVT_END );
282- struct event_subscriber_s *handle = evt_handles + ( EVT_BEGIN - id );
281+ struct event_subscriber_s *handle = evt_handles + ( id - EVT_BEGIN );
283282 size_t ib = 0 ;
284283 size_t ic = 0 ;
285284 const size_t len = handle->numSubscribers ;
0 commit comments