ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix typo

This commit is contained in:
TellowKrinkle 2023-10-15 00:44:11 -05:00 committed by TellowKrinkle
parent 592e356932
commit 51f9ab8498
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pcsx2-qt/MainWindow.cpp
View File

@ -479,14 +479,14 @@ void MainWindow::recreate()
void MainWindow::recreateSettings() void MainWindow::recreateSettings()
{ {
QString current_category; QString current_category;
if (m_setings_window) if (m_settings_window)
{ {
const bool was_visible = m_setings_window->isVisible(); const bool was_visible = m_settings_window->isVisible();
current_category = m_setings_window->getCategory(); current_category = m_settings_window->getCategory();
m_setings_window->hide(); m_settings_window->hide();
m_setings_window->deleteLater(); m_settings_window->deleteLater();
m_setings_window = nullptr; m_settings_window = nullptr;
if (!was_visible) if (!was_visible)
return; return;
@ -528,11 +528,11 @@ void MainWindow::destroySubWindows()
m_controller_settings_window = nullptr; m_controller_settings_window = nullptr;
} }
if (m_setings_window) if (m_settings_window)
{ {
m_setings_window->close(); m_settings_window->close();
m_setings_window->deleteLater(); m_settings_window->deleteLater();
m_setings_window = nullptr; m_settings_window = nullptr;
} }
} }
@ -610,7 +610,7 @@ void MainWindow::onShowAdvancedSettingsToggled(bool checked)
m_ui.menuDebug->menuAction()->setVisible(checked); m_ui.menuDebug->menuAction()->setVisible(checked);
// just recreate the entire settings window, it's easier. // just recreate the entire settings window, it's easier.
if (m_setings_window) if (m_settings_window)
recreateSettings(); recreateSettings();
} }
@ -2286,11 +2286,11 @@ void MainWindow::restoreDisplayWindowGeometryFromConfig()
SettingsWindow* MainWindow::getSettingsWindow() SettingsWindow* MainWindow::getSettingsWindow()
{ {
if (!m_setings_window) if (!m_settings_window)
{ {
m_setings_window = new SettingsWindow(); m_settings_window = new SettingsWindow();
connect(m_setings_window->getInterfaceSettingsWidget(), &InterfaceSettingsWidget::themeChanged, this, &MainWindow::updateTheme); connect(m_settings_window->getInterfaceSettingsWidget(), &InterfaceSettingsWidget::themeChanged, this, &MainWindow::updateTheme);
connect(m_setings_window->getInterfaceSettingsWidget(), &InterfaceSettingsWidget::languageChanged, this, [this]() { connect(m_settings_window->getInterfaceSettingsWidget(), &InterfaceSettingsWidget::languageChanged, this, [this]() {
// reopen settings dialog after it applies // reopen settings dialog after it applies
updateLanguage(); updateLanguage();
// If you doSettings now, on macOS, the window will somehow end up underneath the main window that was created above // If you doSettings now, on macOS, the window will somehow end up underneath the main window that was created above
@ -2299,12 +2299,12 @@ SettingsWindow* MainWindow::getSettingsWindow()
g_main_window->doSettings("Interface"); g_main_window->doSettings("Interface");
}); });
}); });
connect(m_setings_window->getGameListSettingsWidget(), &GameListSettingsWidget::preferEnglishGameListChanged, this, []{ connect(m_settings_window->getGameListSettingsWidget(), &GameListSettingsWidget::preferEnglishGameListChanged, this, []{
g_main_window->m_game_list_widget->refreshGridCovers(); g_main_window->m_game_list_widget->refreshGridCovers();
}); });
} }
return m_setings_window; return m_settings_window;
} }
void MainWindow::doSettings(const char* category /* = nullptr */) void MainWindow::doSettings(const char* category /* = nullptr */)

2
pcsx2-qt/MainWindow.h
View File

@ -282,7 +282,7 @@ private:
DisplayWidget* m_display_widget = nullptr; DisplayWidget* m_display_widget = nullptr;
DisplayContainer* m_display_container = nullptr; DisplayContainer* m_display_container = nullptr;
SettingsWindow* m_setings_window = nullptr; SettingsWindow* m_settings_window = nullptr;
ControllerSettingsWindow* m_controller_settings_window = nullptr; ControllerSettingsWindow* m_controller_settings_window = nullptr;
InputRecordingViewer* m_input_recording_viewer = nullptr; InputRecordingViewer* m_input_recording_viewer = nullptr;
AutoUpdaterDialog* m_auto_updater_dialog = nullptr; AutoUpdaterDialog* m_auto_updater_dialog = nullptr;