Skip to content

Flag for Window to skip reload of log levels (issue #3496) #3536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sockeye2204 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Flag for Window to skip reload of log levels (issue #3496) #3536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/platform/qt/GBAApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ Window* GBAApp::newWindow() {
return nullptr;
}
Window* w = new Window(&m_manager, m_configController, m_windows.count());
w->setSkipResetLevels(true);
connect(w, &Window::destroyed, [this, w]() {
m_windows.removeAll(w);
for (Window* w : m_windows) {
Expand Down
9 changes: 8 additions & 1 deletion src/platform/qt/Window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,9 @@ void Window::loadConfig() {
void Window::reloadConfig() {
const mCoreOptions* opts = m_config->options();

m_log.setLevels(opts->logLevel);
if (!m_skipResetLevels) {
m_log.setLevels(opts->logLevel);
}

if (m_controller) {
m_controller->loadConfig(m_config);
Expand Down Expand Up @@ -1418,6 +1420,7 @@ void Window::setupMenu(QMenuBar* menubar) {

m_actions.addSeparator("file");
m_multiWindow = m_actions.addAction(tr("New multiplayer window"), "multiWindow", GBAApp::app(), &GBAApp::newWindow, "file");
setSkipResetLevels(false);

#ifdef M_CORE_GBA
auto dolphin = m_actions.addAction(tr("Connect to Dolphin..."), "connectDolphin", openNamedTView<DolphinConnector>(&m_dolphinView, true, this), "file");
Expand Down Expand Up @@ -2369,3 +2372,7 @@ void WindowBackground::paintEvent(QPaintEvent* event) {
QRect full(clampSize(QSize(m_aspectWidth, m_aspectHeight), size(), true, false));
painter.drawPixmap(full, logo);
}

void Window::setSkipResetLevels(bool doSkip) {
m_skipResetLevels = doSkip;
}
4 changes: 4 additions & 0 deletions src/platform/qt/Window.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ public slots:

void openView(QWidget* widget);

void setSkipResetLevels(bool doSkip);

#ifdef ENABLE_DEBUGGERS
void consoleOpen();
#endif
Expand Down Expand Up @@ -243,6 +245,8 @@ private slots:
bool m_multiActive = true;
int m_playerId;

bool m_skipResetLevels = false;

QPointer<OverrideView> m_overrideView;
QPointer<SensorView> m_sensorView;
QPointer<DolphinConnector> m_dolphinView;
Expand Down