Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfig

1 files changed, 2 insertions, 3 deletions

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 06dd2e33581d..c2796b866f8f 100644
--- a/scripts/kconfig/qconf.cc
+++ b/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;