Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d49e4687 authored by Arnaud Lacombe's avatar Arnaud Lacombe Committed by Michal Marek
Browse files

xconfig: merge code path to conf_write() 



Avoid to have multiple path saving the config. This fixes an error check
miss when the window is being closed and the user requested the config
to be written.

Reported-by: default avatarHiromu Yakura <hiromu1996@gmail.com>
Pointed-out-by: default avatarMichal Marek <mmarek@suse.cz>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent bdebd489

scripts/kconfig/qconf.cc

+2 −3
Original line number Diff line number Diff line
@@ -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;