From 1b298ca1a338c0300231e1989d40089a082ee8c3 Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 7 Feb 2015 13:05:17 -0500 Subject: [PATCH] ResultVal: Fixed compilation when reassigning a ResultVal. --- src/core/hle/result.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 948b9e38e..9c6ca29e5 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h @@ -307,14 +307,14 @@ public: } ResultVal& operator=(const ResultVal& o) { - if (*this) { - if (o) { + if (!empty()) { + if (!o.empty()) { *GetPointer() = *o.GetPointer(); } else { GetPointer()->~T(); } } else { - if (o) { + if (!o.empty()) { new (&storage) T(*o.GetPointer()); } }