summaryrefslogtreecommitdiff
path: root/src/core/hle/result.h
diff options
context:
space:
mode:
authorGravatar bunnei2015-02-10 18:27:16 -0500
committerGravatar bunnei2015-02-10 18:27:16 -0500
commit27e6e6b3cb2ee1ab3a996c2b4be1d9a3c4e6b75d (patch)
treefd8b0290d4a0353c11c0e168200b20b5a89e297c /src/core/hle/result.h
parentMerge pull request #553 from lioncash/denorm (diff)
parentPTM: Fixed a problem with the gamecoin PTM file. (diff)
downloadyuzu-27e6e6b3cb2ee1ab3a996c2b4be1d9a3c4e6b75d.tar.gz
yuzu-27e6e6b3cb2ee1ab3a996c2b4be1d9a3c4e6b75d.tar.xz
yuzu-27e6e6b3cb2ee1ab3a996c2b4be1d9a3c4e6b75d.zip
Merge pull request #540 from yuriks/multi-archives
FS: Allow multiple instances of the same archive type to be open at once
Diffstat (limited to 'src/core/hle/result.h')
-rw-r--r--src/core/hle/result.h6
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:
307 } 307 }
308 308
309 ResultVal& operator=(const ResultVal& o) { 309 ResultVal& operator=(const ResultVal& o) {
310 if (*this) { 310 if (!empty()) {
311 if (o) { 311 if (!o.empty()) {
312 *GetPointer() = *o.GetPointer(); 312 *GetPointer() = *o.GetPointer();
313 } else { 313 } else {
314 GetPointer()->~T(); 314 GetPointer()->~T();
315 } 315 }
316 } else { 316 } else {
317 if (o) { 317 if (!o.empty()) {
318 new (&storage) T(*o.GetPointer()); 318 new (&storage) T(*o.GetPointer());
319 } 319 }
320 } 320 }