diff options
| author |  darkf | 2014-12-29 19:47:41 -0800 |
|---|---|---|
| committer | darkf | 2014-12-29 19:47:41 -0800 |
| commit | 8ba9ac0f74abb0408a26207a76a0c1808bad8de0 (patch) | |
| tree | f1c7c3393fa726435b5b90bf335567c93e528ef1 /src/common/msg_handler.cpp | |
| parent | Add comment regarding __WIN32__ in SkyEye code (diff) | |
| parent | Merge pull request #367 from bunnei/usat_ssat (diff) | |
| download | yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.tar.gz yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.tar.xz yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.zip | |
Fix merge conflicts
Diffstat (limited to 'src/common/msg_handler.cpp')
| -rw-r--r-- | src/common/msg_handler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/msg_handler.cpp b/src/common/msg_handler.cpp index b3556aaa8..4a47b518e 100644 --- a/src/common/msg_handler.cpp +++ b/src/common/msg_handler.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | // Copyright 2013 Dolphin Emulator Project | 1 | // Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project |
| 2 | // Licensed under GPLv2 | 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 | ||
| 5 | #include <cstdio> | 5 | #include <cstdio> |
| @@ -75,7 +75,7 @@ bool MsgAlert(bool yes_no, int Style, const char* format, ...) | |||
| 75 | Common::CharArrayFromFormatV(buffer, sizeof(buffer)-1, str_translator(format).c_str(), args); | 75 | Common::CharArrayFromFormatV(buffer, sizeof(buffer)-1, str_translator(format).c_str(), args); |
| 76 | va_end(args); | 76 | va_end(args); |
| 77 | 77 | ||
| 78 | ERROR_LOG(MASTER_LOG, "%s: %s", caption.c_str(), buffer); | 78 | LOG_INFO(Common, "%s: %s", caption.c_str(), buffer); |
| 79 | 79 | ||
| 80 | // Don't ignore questions, especially AskYesNo, PanicYesNo could be ignored | 80 | // Don't ignore questions, especially AskYesNo, PanicYesNo could be ignored |
| 81 | if (msg_handler && (AlertEnabled || Style == QUESTION || Style == CRITICAL)) | 81 | if (msg_handler && (AlertEnabled || Style == QUESTION || Style == CRITICAL)) |