mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-11 09:18:40 +12:00
Fix conflicts.
This commit is contained in:
parent
c09b0f511e
commit
9816ec3aa0
35 changed files with 99 additions and 103 deletions
|
@ -363,7 +363,7 @@ int cellSurMixerCreate(const mem_ptr_t<CellSurMixerConfig> config)
|
|||
|
||||
if (mixcount > (port.tag + 14)) // preemptive buffer filling (probably hack)
|
||||
{
|
||||
Sleep(1);
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(1));
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue