Merge remote-tracking branch 'origin/master' into 1.11
This commit is contained in:
@@ -43,8 +43,6 @@ bool Task::Wait(double timeoutMilliseconds) const
|
||||
ZoneColor(TracyWaitZoneColor);
|
||||
const double startTime = Platform::GetTimeSeconds();
|
||||
|
||||
// TODO: no active waiting! use a semaphore!
|
||||
|
||||
do
|
||||
{
|
||||
auto state = GetState();
|
||||
@@ -211,7 +209,7 @@ void Task::OnCancel()
|
||||
{
|
||||
// Wait for it a little bit
|
||||
constexpr double timeout = 10000.0; // 10s
|
||||
LOG(Warning, "Cannot cancel \'{0}\' because it's still running, waiting for end with timeout: {1}ms", ToString(), timeout);
|
||||
//LOG(Warning, "Cannot cancel \'{0}\' because it's still running, waiting for end with timeout: {1}ms", ToString(), timeout);
|
||||
Wait(timeout);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user