aboutsummaryrefslogtreecommitdiff
path: root/src/core/core.h
diff options
context:
space:
mode:
authorTheKoopaKingdom <thekoopakingdom@gmail.com>2017-06-02 17:03:38 -0400
committerTheKoopaKingdom <thekoopakingdom@gmail.com>2017-06-02 18:40:39 -0400
commitf008b22e3b2baa7720ea65c320fe49929a53bad7 (patch)
tree24a15888dd6ebc515a09eaf00623fa23e2d4665d /src/core/core.h
parentff04320c9716b78b7a6047e3c699a0ea4c5431b3 (diff)
Addressed Bunnei's review comments, and made some other tweaks:
- Deleted GetStatus() because it wasn't used anywhere outside of Core::System. - Fixed design flaw where the message bar status could be set despite the game being stopped.
Diffstat (limited to 'src/core/core.h')
-rw-r--r--src/core/core.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/core/core.h b/src/core/core.h
index 6e555f954..4e3b6b409 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -108,16 +108,14 @@ public:
PerfStats perf_stats;
FrameLimiter frame_limiter;
- ResultStatus GetStatus() {
- return status;
- }
-
- void SetStatus(ResultStatus new_status, std::string details = std::string()) {
+ void SetStatus(ResultStatus new_status, const char* details = nullptr) {
status = new_status;
- status_details = details;
+ if (details) {
+ status_details = details;
+ }
}
- std::string GetStatusDetails() {
+ const std::string& GetStatusDetails() const {
return status_details;
}
@@ -147,8 +145,8 @@ private:
static System s_instance;
- ResultStatus status;
- std::string status_details;
+ ResultStatus status = ResultStatus::Success;
+ std::string status_details = "";
};
inline ARM_Interface& CPU() {