diff --git a/rpcs3/rpcs3qt/gui_application.cpp b/rpcs3/rpcs3qt/gui_application.cpp index 54052af4ce..8b93a340bc 100644 --- a/rpcs3/rpcs3qt/gui_application.cpp +++ b/rpcs3/rpcs3qt/gui_application.cpp @@ -163,7 +163,7 @@ bool gui_application::Init() if (welcome->exec() == QDialog::Rejected) { - // if the agreement on RPCS3's usage conditions was not accecped by the user, ask the main window to softly terminate + // If the agreement on RPCS3's usage conditions was not accecpted by the user, ask the main window to gracefully terminate return false; } } diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index ad7e2ce01f..09a09ce221 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -1855,18 +1855,18 @@ void main_window::SaveWindowState() const // to initialize some modules leaving other modules uninitialized (NULL pointed). // So, the following checks on NULL pointer are provided before accessing the related module's object - if (m_mw != nullptr) + if (m_mw) { m_gui_settings->SetValue(gui::mw_mwState, m_mw->saveState(), true); } - if (m_game_list_frame != nullptr) + if (m_game_list_frame) { // Save column settings m_game_list_frame->SaveSettings(); } - if (m_debugger_frame != nullptr) + if (m_debugger_frame) { // Save splitter state m_debugger_frame->SaveSettings(); diff --git a/rpcs3/rpcs3qt/welcome_dialog.cpp b/rpcs3/rpcs3qt/welcome_dialog.cpp index 27ae7d87f3..defbce4012 100644 --- a/rpcs3/rpcs3qt/welcome_dialog.cpp +++ b/rpcs3/rpcs3qt/welcome_dialog.cpp @@ -51,9 +51,9 @@ welcome_dialog::welcome_dialog(std::shared_ptr gui_settings, bool ui->use_dark_theme->setVisible(false); ui->use_dark_theme->setEnabled(false); #else - #ifndef _WIN32 - ui->create_applications_menu_shortcut->setText(tr("&Create Application Menu shortcut")); - #endif +#ifndef _WIN32 + ui->create_applications_menu_shortcut->setText(tr("&Create Application Menu shortcut")); +#endif ui->use_dark_theme->setVisible(!is_manual_show); ui->use_dark_theme->setEnabled(!is_manual_show); @@ -103,7 +103,7 @@ welcome_dialog::welcome_dialog(std::shared_ptr gui_settings, bool connect(this, &QDialog::rejected, this, [this]() // "reject" signal's event handler { - // if the agreement on RPCS3's usage conditions was not accecped by the user, always display the initial welcome dialog at next startup + // if the agreement on RPCS3's usage conditions was not accecpted by the user, always display the initial welcome dialog at next startup m_gui_settings->SetValue(gui::ib_show_welcome, QVariant(true)); }); }