LV2: Fix postponed notifications for multiple users

RPCS3 · Jun 5, 2023 · 4e26c34 · 4e26c34
1 parent edd4b49
commit 4e26c34
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/rpcs3/Emu/Cell/lv2/lv2.cpp b/rpcs3/Emu/Cell/lv2/lv2.cpp
@@ -1644,7 +1644,7 @@ void lv2_obj::cleanup()
 
 void lv2_obj::schedule_all(u64 current_time)
 {
-	usz notify_later_idx = 0;
+	usz notify_later_idx = std::basic_string_view<const void*>{g_to_notify, 4}.find_first_of(nullptr);
 
 	if (!g_pending && g_scheduler_ready)
 	{
@@ -1663,7 +1663,7 @@ void lv2_obj::schedule_all(u64 current_time)
 					continue;
 				}
 
-				if (notify_later_idx == std::size(g_to_notify))
+				if (notify_later_idx >= std::size(g_to_notify))
 				{
 					// Out of notification slots, notify locally (resizable container is not worth it)
 					target->state.notify_one(cpu_flag::signal + cpu_flag::suspend);
@@ -1697,7 +1697,7 @@ void lv2_obj::schedule_all(u64 current_time)
 				ensure(!target->state.test_and_set(cpu_flag::notify));
 
 				// Otherwise notify it to wake itself
-				if (notify_later_idx == std::size(g_to_notify))
+				if (notify_later_idx >= std::size(g_to_notify))
 				{
 					// Out of notification slots, notify locally (resizable container is not worth it)
 					target->state.notify_one(cpu_flag::notify);