diff options
author | TheKoopaKingdom <thekoopakingdom@gmail.com> | 2017-04-13 07:15:23 +0200 |
---|---|---|
committer | TheKoopaKingdom <thekoopakingdom@gmail.com> | 2017-06-03 00:28:14 +0200 |
commit | 0409bdfea5ea046e3d040ab494b8a0764fd35424 (patch) | |
tree | 94540c98e22d04a8a1d6ca4d24ac3ae429ed3d97 /src/core | |
parent | Added message to status bar to show core errors ignored by the user. (diff) | |
download | yuzu-0409bdfea5ea046e3d040ab494b8a0764fd35424.tar yuzu-0409bdfea5ea046e3d040ab494b8a0764fd35424.tar.gz yuzu-0409bdfea5ea046e3d040ab494b8a0764fd35424.tar.bz2 yuzu-0409bdfea5ea046e3d040ab494b8a0764fd35424.tar.lz yuzu-0409bdfea5ea046e3d040ab494b8a0764fd35424.tar.xz yuzu-0409bdfea5ea046e3d040ab494b8a0764fd35424.tar.zst yuzu-0409bdfea5ea046e3d040ab494b8a0764fd35424.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/core.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/core/core.h b/src/core/core.h index a7b4f8d62..bc363ed97 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -6,6 +6,9 @@ #include <memory> #include <string> + +#include <boost/optional.hpp> + #include "common/common_types.h" #include "core/memory.h" #include "core/perf_stats.h" @@ -112,8 +115,16 @@ public: return status; } - void SetStatus(ResultStatus newStatus) { - status = newStatus; + void SetStatus(ResultStatus new_status, std::string details = std::string()) { + status = new_status; + if (details == std::string()) + status_details = boost::none; + else + status_details = details; + } + + boost::optional<std::string> GetStatusDetails() { + return status_details; } private: @@ -141,7 +152,9 @@ private: std::unique_ptr<Core::TelemetrySession> telemetry_session; static System s_instance; + ResultStatus status; + boost::optional<std::string> status_details; }; inline ARM_Interface& CPU() { |