diff options
| author | 2017-04-13 01:18:54 -0400 | |
|---|---|---|
| committer | 2017-06-02 18:28:14 -0400 | |
| commit | a8aef599e02e336f9ecb8d5cfc50aa856ea0a1c7 (patch) | |
| tree | 37a7edc6a27eff75c96117203f48c9f1ec640b97 /src/core/core.h | |
| parent | Optimized messages that were repetitive and added ability for core errors to ... (diff) | |
| download | yuzu-a8aef599e02e336f9ecb8d5cfc50aa856ea0a1c7.tar.gz yuzu-a8aef599e02e336f9ecb8d5cfc50aa856ea0a1c7.tar.xz yuzu-a8aef599e02e336f9ecb8d5cfc50aa856ea0a1c7.zip | |
Created a whitelist of system archives to prevent false positives creating dialogs.
Diffstat (limited to 'src/core/core.h')
| -rw-r--r-- | src/core/core.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/core/core.h b/src/core/core.h index bc363ed97..6e555f954 100644 --- a/src/core/core.h +++ b/src/core/core.h | |||
| @@ -6,9 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | #include <memory> | 7 | #include <memory> |
| 8 | #include <string> | 8 | #include <string> |
| 9 | |||
| 10 | #include <boost/optional.hpp> | ||
| 11 | |||
| 12 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 13 | #include "core/memory.h" | 10 | #include "core/memory.h" |
| 14 | #include "core/perf_stats.h" | 11 | #include "core/perf_stats.h" |
| @@ -117,13 +114,10 @@ public: | |||
| 117 | 114 | ||
| 118 | void SetStatus(ResultStatus new_status, std::string details = std::string()) { | 115 | void SetStatus(ResultStatus new_status, std::string details = std::string()) { |
| 119 | status = new_status; | 116 | status = new_status; |
| 120 | if (details == std::string()) | 117 | status_details = details; |
| 121 | status_details = boost::none; | ||
| 122 | else | ||
| 123 | status_details = details; | ||
| 124 | } | 118 | } |
| 125 | 119 | ||
| 126 | boost::optional<std::string> GetStatusDetails() { | 120 | std::string GetStatusDetails() { |
| 127 | return status_details; | 121 | return status_details; |
| 128 | } | 122 | } |
| 129 | 123 | ||
| @@ -154,7 +148,7 @@ private: | |||
| 154 | static System s_instance; | 148 | static System s_instance; |
| 155 | 149 | ||
| 156 | ResultStatus status; | 150 | ResultStatus status; |
| 157 | boost::optional<std::string> status_details; | 151 | std::string status_details; |
| 158 | }; | 152 | }; |
| 159 | 153 | ||
| 160 | inline ARM_Interface& CPU() { | 154 | inline ARM_Interface& CPU() { |