summaryrefslogtreecommitdiff
path: root/src/core/core.h
diff options
context:
space:
mode:
authorGravatar TheKoopaKingdom2017-06-02 17:03:38 -0400
committerGravatar TheKoopaKingdom2017-06-02 18:40:39 -0400
commitf008b22e3b2baa7720ea65c320fe49929a53bad7 (patch)
tree24a15888dd6ebc515a09eaf00623fa23e2d4665d /src/core/core.h
parentFixed wiki URLs. (diff)
downloadyuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.tar.gz
yuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.tar.xz
yuzu-f008b22e3b2baa7720ea65c320fe49929a53bad7.zip
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:
108 PerfStats perf_stats; 108 PerfStats perf_stats;
109 FrameLimiter frame_limiter; 109 FrameLimiter frame_limiter;
110 110
111 ResultStatus GetStatus() { 111 void SetStatus(ResultStatus new_status, const char* details = nullptr) {
112 return status;
113 }
114
115 void SetStatus(ResultStatus new_status, std::string details = std::string()) {
116 status = new_status; 112 status = new_status;
117 status_details = details; 113 if (details) {
114 status_details = details;
115 }
118 } 116 }
119 117
120 std::string GetStatusDetails() { 118 const std::string& GetStatusDetails() const {
121 return status_details; 119 return status_details;
122 } 120 }
123 121
@@ -147,8 +145,8 @@ private:
147 145
148 static System s_instance; 146 static System s_instance;
149 147
150 ResultStatus status; 148 ResultStatus status = ResultStatus::Success;
151 std::string status_details; 149 std::string status_details = "";
152}; 150};
153 151
154inline ARM_Interface& CPU() { 152inline ARM_Interface& CPU() {