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

Commit bac6aa86 authored by Michal Marek's avatar Michal Marek
Browse files

xconfig: Abort close if configuration cannot be saved 



Give the user an opportunity to fix the error or save the configuration
under a different path.

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

scripts/kconfig/qconf.cc

+10 −3
Original line number Original line Diff line number Diff line
@@ -1478,10 +1478,13 @@ void ConfigMainWindow::loadConfig(void) 
	ConfigView::updateListAll();

	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!"));

		QMessageBox::information(this, "qconf", _("Unable to save configuration!"));

		return false;

	}

	return true;

}

}





void ConfigMainWindow::saveConfigAs(void)

void ConfigMainWindow::saveConfigAs(void)
@@ -1642,7 +1645,11 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e) 
	mb.setButtonText(QMessageBox::Cancel, _("Cancel Exit"));

	mb.setButtonText(QMessageBox::Cancel, _("Cancel Exit"));

	switch (mb.exec()) {

	switch (mb.exec()) {

	case QMessageBox::Yes:

	case QMessageBox::Yes:

		saveConfig();

		if (saveConfig())

			e->accept();

		else

			e->ignore();

		break;

	case QMessageBox::No:

	case QMessageBox::No:

		e->accept();

		e->accept();

		break;

		break;

scripts/kconfig/qconf.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -311,7 +311,7 @@ public slots: 
	void listFocusChanged(void);

	void listFocusChanged(void);

	void goBack(void);

	void goBack(void);

	void loadConfig(void);

	void loadConfig(void);

	void saveConfig(void);

	bool saveConfig(void);

	void saveConfigAs(void);

	void saveConfigAs(void);

	void searchConfig(void);

	void searchConfig(void);

	void showSingleView(void);

	void showSingleView(void);