diff options
| author | Subv <subv2112@gmail.com> | 2015-02-07 19:05:17 +0100 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-02-10 16:43:44 +0100 |
| commit | ca1a87ef7d32a938c1ed3a59f8638cca54071a24 (patch) | |
| tree | d1cc8339728f3ca029f4dbd66de86306669f73ac | |
| parent | FS: Allow multiple instances of the same archive type to be open at once (diff) | |
| download | yuzu-ca1a87ef7d32a938c1ed3a59f8638cca54071a24.tar yuzu-ca1a87ef7d32a938c1ed3a59f8638cca54071a24.tar.gz yuzu-ca1a87ef7d32a938c1ed3a59f8638cca54071a24.tar.bz2 yuzu-ca1a87ef7d32a938c1ed3a59f8638cca54071a24.tar.lz yuzu-ca1a87ef7d32a938c1ed3a59f8638cca54071a24.tar.xz yuzu-ca1a87ef7d32a938c1ed3a59f8638cca54071a24.tar.zst yuzu-ca1a87ef7d32a938c1ed3a59f8638cca54071a24.zip | |
| -rw-r--r-- | src/core/hle/result.h | 6 |
1 files 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()); } } |