summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/am/applets/error.cpp
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2019-04-05 00:09:42 +0200
committerZach Hilman <zachhilman@gmail.com>2019-04-17 17:35:24 +0200
commit2adb226b26f7f4b9a2c5cd4ea056479d7b5c1527 (patch)
treedab1215651c1855ba471c5c69b7c2c7f9e2e24ba /src/core/hle/service/am/applets/error.cpp
parentmain: Add GMainWindow hooks for Error display (diff)
downloadyuzu-2adb226b26f7f4b9a2c5cd4ea056479d7b5c1527.tar
yuzu-2adb226b26f7f4b9a2c5cd4ea056479d7b5c1527.tar.gz
yuzu-2adb226b26f7f4b9a2c5cd4ea056479d7b5c1527.tar.bz2
yuzu-2adb226b26f7f4b9a2c5cd4ea056479d7b5c1527.tar.lz
yuzu-2adb226b26f7f4b9a2c5cd4ea056479d7b5c1527.tar.xz
yuzu-2adb226b26f7f4b9a2c5cd4ea056479d7b5c1527.tar.zst
yuzu-2adb226b26f7f4b9a2c5cd4ea056479d7b5c1527.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/am/applets/error.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/core/hle/service/am/applets/error.cpp b/src/core/hle/service/am/applets/error.cpp
index fec014f3b..04774bedc 100644
--- a/src/core/hle/service/am/applets/error.cpp
+++ b/src/core/hle/service/am/applets/error.cpp
@@ -2,6 +2,10 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <array>
+#include <cstring>
+#include "common/assert.h"
+#include "common/logging/log.h"
#include "common/string_util.h"
#include "core/core.h"
#include "core/frontend/applets/error.h"
@@ -54,7 +58,7 @@ struct ApplicationErrorArg {
};
static_assert(sizeof(ApplicationErrorArg) == 0x1014, "ApplicationErrorArg has incorrect size.");
-union ErrorArguments {
+union Error::ErrorArguments {
ShowError error;
ShowErrorRecord error_record;
SystemErrorArg system_error;
@@ -107,6 +111,7 @@ void Error::Initialize() {
case ErrorAppletMode::ShowSystemError:
CopyArgumentData(data, args->system_error);
error_code = ResultCode(Decode64BitError(args->system_error.error_code_64));
+ break;
case ErrorAppletMode::ShowApplicationError:
CopyArgumentData(data, args->application_error);
error_code = ResultCode(args->application_error.error_code);