:Merge remote-tracking branch 'refs/remotes/origin/master'

yuxshao · Jun 22, 2024 · f220977 · f220977
2 parents 27345e1 + 5feb27d
commit f220977
Show file tree

Hide file tree

Showing 5 changed files with 2,157 additions and 103 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -109,6 +109,7 @@ <h3>Thanks</h3>
             <li>jaxcheese, Ronto_255, ArcOfDream, and neozoid for providing demo tunes!</li>
 			<li>Ewan Green for continued development / maintenance around building, styles, etc.</li>
             <li>OPNA2608 for maintaining packaging and getting this to build properly!</li>
+			<li>Youwhang, Awwchang, Chroma, くろかいこ for the Japanese translation!</li>
 			<li>Youwhang for the Korean translation!</li>
 			<li>EnthWyrr (and curelapse, louie) for the Spanish translation!</li>
             <li>steedfarmer for helping me hunt down this nasty networking bug!</li>

diff --git a/src/editor/EditorWindow.cpp b/src/editor/EditorWindow.cpp
@@ -284,7 +284,7 @@ EditorWindow::EditorWindow(QWidget *parent)
   connect(ui->actionShortcuts, &QAction::triggered, m_shortcuts_dialog,
           &QDialog::exec);
   connect(ui->actionExit, &QAction::triggered,
-          []() { QApplication::instance()->quit(); });
+          []() { QApplication::closeAllWindows(); });
   connect(ui->actionAbout, &QAction::triggered, [=]() {
     QMessageBox::about(this, "About",
                        tr("Multiplayer pxtone music editor. Special "