Commit 060e05c3 authored by Masahiro Yamada's avatar Masahiro Yamada

kconfig: qconf: remove initial call to conf_changed()

If any CONFIG option is changed while loading the .config file,
conf_read() calls conf_set_changed(true) and then the conf_changed()
callback.

With conf_read() moved after window initialization, the explicit
conf_changed() call can be removed.
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent fb3f7f0f
...@@ -1397,8 +1397,6 @@ ConfigMainWindow::ConfigMainWindow(void) ...@@ -1397,8 +1397,6 @@ ConfigMainWindow::ConfigMainWindow(void)
conf_set_changed_callback(conf_changed); conf_set_changed_callback(conf_changed);
// Set saveAction's initial state
conf_changed();
configname = xstrdup(conf_get_configname()); configname = xstrdup(conf_get_configname());
QAction *saveAsAction = new QAction("Save &As...", this); QAction *saveAsAction = new QAction("Save &As...", this);
...@@ -1904,7 +1902,6 @@ int main(int ac, char** av) ...@@ -1904,7 +1902,6 @@ int main(int ac, char** av)
conf_parse(name); conf_parse(name);
fixup_rootmenu(&rootmenu); fixup_rootmenu(&rootmenu);
conf_read(NULL);
//zconfdump(stdout); //zconfdump(stdout);
configApp = new QApplication(ac, av); configApp = new QApplication(ac, av);
...@@ -1916,6 +1913,9 @@ int main(int ac, char** av) ...@@ -1916,6 +1913,9 @@ int main(int ac, char** av)
//zconfdump(stdout); //zconfdump(stdout);
configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit())); configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit()));
configApp->connect(configApp, SIGNAL(aboutToQuit()), v, SLOT(saveSettings())); configApp->connect(configApp, SIGNAL(aboutToQuit()), v, SLOT(saveSettings()));
conf_read(NULL);
v->show(); v->show();
configApp->exec(); configApp->exec();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment