1 files changed, 10 insertions, 7 deletions

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index c2796b866f8..df274febb3e 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1478,10 +1478,13 @@ void ConfigMainWindow::loadConfig(void)
         ConfigView::updateListAll();
 }
 
-void ConfigMainWindow::saveConfig(void)
+bool ConfigMainWindow::saveConfig(void)
 {
-        if (conf_write(NULL))
+        if (conf_write(NULL)) {
                 QMessageBox::information(this, "qconf", _("Unable to save configuration!"));
+                return false;
+        }
+        return true;
 }
 
 void ConfigMainWindow::saveConfigAs(void)
@@ -1642,7 +1645,11 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e)
         mb.setButtonText(QMessageBox::Cancel, _("Cancel Exit"));
         switch (mb.exec()) {
         case QMessageBox::Yes:
-                saveConfig();
+                if (saveConfig())
+                        e->accept();
+                else
+                        e->ignore();
+                break;
         case QMessageBox::No:
                 e->accept();
                 break;
@@ -1745,10 +1752,6 @@ int main(int ac, char** av)
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
 
-#ifndef LKC_DIRECT_LINK
-        kconfig_load();
-#endif
-
         progname = av[0];
         configApp = new QApplication(ac, av);
         if (ac > 1 && av[1][0] == '-') {