aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2011-05-25 15:33:20 +0200
committerMichal Marek <mmarek@suse.cz>2011-05-25 15:33:20 +0200
commitac9a126571e76abec76e1c1f46672e82501eab1e (patch)
treec7caa327db8dec4cfc3164f0d08828757e104539 /scripts
parent4c54f0f846102b05efcc99114ada2b913baab161 (diff)
parentd49e46875c11a09e80e76c66db90710369b8fe12 (diff)
downloadautogen-ac9a126571e76abec76e1c1f46672e82501eab1e.tar.gz
autogen-ac9a126571e76abec76e1c1f46672e82501eab1e.tar.xz
autogen-ac9a126571e76abec76e1c1f46672e82501eab1e.zip
Merge branch 'kbuild/kconfig-for-40' into kbuild/kconfig
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/qconf.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 06dd2e33581..c2796b866f8 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;