diff options
| author | 2019-03-11 19:45:22 -0400 | |
|---|---|---|
| committer | 2019-04-17 11:35:24 -0400 | |
| commit | 8f8049e846f38d548e975243bc42ce1b09a71ae3 (patch) | |
| tree | 76f18dd10a51460024e440d4ea51eb7de4e92791 /src/core | |
| parent | main: Switch to AppletManager for frontend (diff) | |
| download | yuzu-8f8049e846f38d548e975243bc42ce1b09a71ae3.tar.gz yuzu-8f8049e846f38d548e975243bc42ce1b09a71ae3.tar.xz yuzu-8f8049e846f38d548e975243bc42ce1b09a71ae3.zip | |
main: Add GMainWindow hooks for Error display
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/frontend/applets/general_frontend.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/am/applets/error.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/frontend/applets/general_frontend.cpp b/src/core/frontend/applets/general_frontend.cpp index d2762db96..b974f2289 100644 --- a/src/core/frontend/applets/general_frontend.cpp +++ b/src/core/frontend/applets/general_frontend.cpp | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | // Copyright 2018 yuzu emulator team | 1 | // Copyright 2019 yuzu emulator team |
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
diff --git a/src/core/hle/service/am/applets/error.cpp b/src/core/hle/service/am/applets/error.cpp index df0408edc..fec014f3b 100644 --- a/src/core/hle/service/am/applets/error.cpp +++ b/src/core/hle/service/am/applets/error.cpp | |||
| @@ -41,7 +41,7 @@ struct SystemErrorArg { | |||
| 41 | std::array<char, 0x800> main_text; | 41 | std::array<char, 0x800> main_text; |
| 42 | std::array<char, 0x800> detail_text; | 42 | std::array<char, 0x800> detail_text; |
| 43 | }; | 43 | }; |
| 44 | static_assert(sizeof(SystemErrorArg) == 0x1018, "ApplicationErrorArg has incorrect size."); | 44 | static_assert(sizeof(SystemErrorArg) == 0x1018, "SystemErrorArg has incorrect size."); |
| 45 | 45 | ||
| 46 | struct ApplicationErrorArg { | 46 | struct ApplicationErrorArg { |
| 47 | u8 mode; | 47 | u8 mode; |
| @@ -77,7 +77,7 @@ ResultCode Decode64BitError(u64 error) { | |||
| 77 | return {static_cast<ErrorModule>(module), static_cast<u32>(description)}; | 77 | return {static_cast<ErrorModule>(module), static_cast<u32>(description)}; |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | } // namespace | 80 | } // Anonymous namespace |
| 81 | 81 | ||
| 82 | Error::Error(const Core::Frontend::ErrorApplet& frontend) : frontend(frontend) {} | 82 | Error::Error(const Core::Frontend::ErrorApplet& frontend) : frontend(frontend) {} |
| 83 | 83 | ||