Skip to content

Commit 1a36f67

Browse files
committed
Avoid double opening the "save file" menu
1 parent bcc2132 commit 1a36f67

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

cfgeditor.cpp

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,10 @@ void CFGEditor::setUpMenuBar(QMenuBar* mb) {
112112
"Do you want to save it before opening a new one?",
113113
QMessageBox::Yes | QMessageBox::No | QMessageBox::Abort );
114114
if (res == QMessageBox::Yes) {
115-
sprite->to_file(QFileDialog::getSaveFileName(this, tr("Save file"), sprite->name(), tr("JSON (*.json)")));
115+
auto filename = QFileDialog::getSaveFileName(this, tr("Save file"), sprite->name(), tr("JSON (*.json)"));
116+
if (filename.size() == 0)
117+
return;
118+
sprite->to_file(filename);
116119
} else if (res == QMessageBox::Abort) {
117120
return;
118121
}
@@ -131,7 +134,10 @@ void CFGEditor::setUpMenuBar(QMenuBar* mb) {
131134
QMessageBox::Yes | QMessageBox::No | QMessageBox::Abort );
132135
if (res == QMessageBox::Yes) {
133136
saveSprite();
134-
sprite->to_file(QFileDialog::getSaveFileName(this, tr("Save file"), sprite->name(), tr("JSON (*.json)")));
137+
auto filename = QFileDialog::getSaveFileName(this, tr("Save file"), sprite->name(), tr("JSON (*.json)"));
138+
if (filename.size() == 0)
139+
return;
140+
sprite->to_file(filename);
135141
} else if (res == QMessageBox::Abort) {
136142
return;
137143
}
@@ -156,7 +162,10 @@ void CFGEditor::setUpMenuBar(QMenuBar* mb) {
156162

157163
file->addAction("&Save As", Qt::CTRL | Qt::ALT | Qt::Key_S, qApp, [&]() {
158164
saveSprite();
159-
sprite->to_file(QFileDialog::getSaveFileName(this, tr("Save file"), sprite->name(), tr("JSON (*.json);;CFG (*.cfg)")));
165+
auto filename = QFileDialog::getSaveFileName(this, tr("Save file"), sprite->name(), tr("JSON (*.json);;CFG (*.cfg)"));
166+
if (filename.size() == 0)
167+
return;
168+
sprite->to_file(filename);
160169
});
161170

162171
display->addAction("&Load Custom Map16", qApp, [&]() {

0 commit comments

Comments
 (0)