Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 261614
b: refs/heads/master
c: ac9a126
h: refs/heads/master
v: v3
  • Loading branch information
Michal Marek committed May 25, 2011
1 parent 0052bd3 commit d496635
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4c54f0f846102b05efcc99114ada2b913baab161
refs/heads/master: ac9a126571e76abec76e1c1f46672e82501eab1e
5 changes: 2 additions & 3 deletions trunk/scripts/kconfig/qconf.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1489,8 +1489,7 @@ void ConfigMainWindow::saveConfigAs(void)
QString s = Q3FileDialog::getSaveFileName(conf_get_configname(), NULL, this);
if (s.isNull())
return;
if (conf_write(QFile::encodeName(s)))
QMessageBox::information(this, "qconf", _("Unable to save configuration!"));
saveConfig();
}

void ConfigMainWindow::searchConfig(void)
Expand Down Expand Up @@ -1643,7 +1642,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e)
mb.setButtonText(QMessageBox::Cancel, _("Cancel Exit"));
switch (mb.exec()) {
case QMessageBox::Yes:
conf_write(NULL);
saveConfig();
case QMessageBox::No:
e->accept();
break;
Expand Down

0 comments on commit d496635

Please sign in to comment.