summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-01-18 03:08:24 +0100
committerGitHub <noreply@github.com>2022-01-18 03:08:24 +0100
commit101d86897b729ca66caf7cfee246e6f238ecf723 (patch)
tree92b516dd4958ca01bb5544a475011a2634412132 /src/common
parentMerge pull request #7724 from ameerj/astc_new_nv (diff)
parentcore: hle: kernel: KThread: Integrate with KWorkerTask and implement DoWorkerTaskImpl. (diff)
downloadyuzu-101d86897b729ca66caf7cfee246e6f238ecf723.tar
yuzu-101d86897b729ca66caf7cfee246e6f238ecf723.tar.gz
yuzu-101d86897b729ca66caf7cfee246e6f238ecf723.tar.bz2
yuzu-101d86897b729ca66caf7cfee246e6f238ecf723.tar.lz
yuzu-101d86897b729ca66caf7cfee246e6f238ecf723.tar.xz
yuzu-101d86897b729ca66caf7cfee246e6f238ecf723.tar.zst
yuzu-101d86897b729ca66caf7cfee246e6f238ecf723.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/fiber.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/common/fiber.cpp b/src/common/fiber.cpp
index 62010d762..81b212e4b 100644
--- a/src/common/fiber.cpp
+++ b/src/common/fiber.cpp
@@ -124,7 +124,10 @@ void Fiber::YieldTo(std::weak_ptr<Fiber> weak_from, Fiber& to) {
// "from" might no longer be valid if the thread was killed
if (auto from = weak_from.lock()) {
- ASSERT(from->impl->previous_fiber != nullptr);
+ if (from->impl->previous_fiber == nullptr) {
+ ASSERT_MSG(false, "previous_fiber is nullptr!");
+ return;
+ }
from->impl->previous_fiber->impl->context = transfer.fctx;
from->impl->previous_fiber->impl->guard.unlock();
from->impl->previous_fiber.reset();