yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #650 from jroweboy/logging-stuff 

Minor logging fixes
This commit is contained in:
bunnei 2018-07-12 06:42:46 -07:00 committed by GitHub
parent 7230ceb584 b30c5370b1
commit b89fb430c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/yuzu/debugger/console.cpp
View File

@ -14,6 +14,13 @@
namespace Debugger { namespace Debugger {
void ToggleConsole() { void ToggleConsole() {
static bool console_shown = false;
if (console_shown == UISettings::values.show_console) {
return;
} else {
console_shown = UISettings::values.show_console;
}
#if defined(_WIN32) && !defined(_DEBUG) #if defined(_WIN32) && !defined(_DEBUG)
FILE* temp; FILE* temp;
if (UISettings::values.show_console) { if (UISettings::values.show_console) {

2
src/yuzu/main.cpp
View File

@ -908,8 +908,6 @@ void GMainWindow::UpdateUITheme() {
#endif #endif
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>());
MicroProfileOnThreadCreate("Frontend"); MicroProfileOnThreadCreate("Frontend");
SCOPE_EXIT({ MicroProfileShutdown(); }); SCOPE_EXIT({ MicroProfileShutdown(); });

3
src/yuzu_cmd/yuzu.cpp
View File

@ -127,6 +127,7 @@ int main(int argc, char** argv) {
#endif #endif
Log::Filter log_filter(Log::Level::Debug); Log::Filter log_filter(Log::Level::Debug);
log_filter.ParseFilterString(Settings::values.log_filter);
Log::SetGlobalFilter(log_filter); Log::SetGlobalFilter(log_filter);
Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>()); Log::AddBackend(std::make_unique<Log::ColorConsoleBackend>());
@ -142,8 +143,6 @@ int main(int argc, char** argv) {
return -1; return -1;
} }
log_filter.ParseFilterString(Settings::values.log_filter);
// Apply the command line arguments // Apply the command line arguments
Settings::values.gdbstub_port = gdb_port; Settings::values.gdbstub_port = gdb_port;
Settings::values.use_gdbstub = use_gdbstub; Settings::values.use_gdbstub = use_gdbstub;