Skip to content

Commit

Permalink
Merge branch 'main' into text-cursor
Browse files Browse the repository at this point in the history
  • Loading branch information
ickshonpe authored Feb 26, 2025
2 parents e534bd9 + 831ecf0 commit fc079f1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions crates/bevy_tasks/src/task_pool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ impl TaskPool {
.is_ok();
}
};
execute_forever.or(get_results).await
get_results.or(execute_forever).await
}

#[inline]
Expand All @@ -505,7 +505,7 @@ impl TaskPool {
let _result = AssertUnwindSafe(tick_forever).catch_unwind().await.is_ok();
}
};
execute_forever.or(get_results).await
get_results.or(execute_forever).await
}

#[inline]
Expand All @@ -527,7 +527,7 @@ impl TaskPool {
.is_ok();
}
};
execute_forever.or(get_results).await
get_results.or(execute_forever).await
}

#[inline]
Expand All @@ -545,7 +545,7 @@ impl TaskPool {
let _result = AssertUnwindSafe(tick_forever).catch_unwind().await.is_ok();
}
};
execute_forever.or(get_results).await
get_results.or(execute_forever).await
}

/// Spawns a static future onto the thread pool. The returned [`Task`] is a
Expand Down

0 comments on commit fc079f1

Please sign in to comment.