From d4966357ef9983f1808347f72972a1b41af44b85 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Wed, 25 May 2011 15:33:20 +0200 Subject: [PATCH] --- yaml --- r: 261614 b: refs/heads/master c: ac9a126571e76abec76e1c1f46672e82501eab1e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/scripts/kconfig/qconf.cc | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 56969795e682..61f20a62565d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c54f0f846102b05efcc99114ada2b913baab161 +refs/heads/master: ac9a126571e76abec76e1c1f46672e82501eab1e diff --git a/trunk/scripts/kconfig/qconf.cc b/trunk/scripts/kconfig/qconf.cc index 06dd2e33581d..c2796b866f8f 100644 --- a/trunk/scripts/kconfig/qconf.cc +++ b/trunk/scripts/kconfig/qconf.cc @@ -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) @@ -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;