dahjah/yuzu
1
0
Fork 0
mirror of https://codeberg.org/yuzu-emu/yuzu.git synced 2025-12-16 12:09:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MacOS: Fix Debugger namespace naming confilct

Browse Source
This commit is contained in:
Reg Tiangha 2024-06-18 18:34:59 -06:00 committed by Mike Lothian
parent bf1cfab4ed
commit cf5173aafa
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/yuzu/configuration/configure_debug.cpp
View File

@ -112,7 +112,7 @@ void ConfigureDebug::ApplyConfiguration() {
Settings::values.extended_logging = ui->extended_logging->isChecked();
Settings::values.perform_vulkan_check = ui->perform_vulkan_check->isChecked();
UISettings::values.disable_web_applet = ui->disable_web_applet->isChecked();
Debugger::ToggleConsole();
DebuggerYuzu::ToggleConsole();
Common::Log::Filter filter;
filter.ParseFilterString(Settings::values.log_filter.GetValue());
Common::Log::SetGlobalFilter(filter);

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

@ -11,7 +11,7 @@
#include "yuzu/debugger/console.h"
#include "yuzu/uisettings.h"
namespace Debugger {
namespace DebuggerYuzu {
void ToggleConsole() {
static bool console_shown = false;
if (console_shown == UISettings::values.show_console.GetValue()) {
@ -46,4 +46,4 @@ void ToggleConsole() {
SetColorConsoleBackendEnabled(UISettings::values.show_console.GetValue());
#endif
}
} // namespace Debugger
} // namespace DebuggerYuzu

4
src/yuzu/debugger/console.h
View File

@ -3,11 +3,11 @@
#pragma once
namespace Debugger {
namespace DebuggerYuzu {
/**
* Uses the WINAPI to hide or show the stderr console. This function is a placeholder until we can
* get a real qt logging window which would work for all platforms.
*/
void ToggleConsole();
} // namespace Debugger
} // namespace DebuggerYuzu

2
src/yuzu/main.cpp
View File

@ -1425,7 +1425,7 @@ void GMainWindow::RestoreUIState() {
ui->action_Show_Status_Bar->setChecked(UISettings::values.show_status_bar.GetValue());
ui->action_Show_Folders_In_List->setChecked(UISettings::values.show_folders_in_list.GetValue());
statusBar()->setVisible(ui->action_Show_Status_Bar->isChecked());
Debugger::ToggleConsole();
DebuggerYuzu::ToggleConsole();
}
void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {