]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
kconfig: qconf: remove initial call to conf_changed()
authorMasahiro Yamada <masahiroy@kernel.org>
Sat, 1 Jun 2024 18:20:39 +0000 (03:20 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Mon, 15 Jul 2024 16:08:36 +0000 (01:08 +0900)
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: Masahiro Yamada <masahiroy@kernel.org>
scripts/kconfig/qconf.cc

index c6c42c0f4e5d588b49da9c38d494c57b2f4233c0..e62e862ea283ec0021ea28e7e08c2941015c05ed 100644 (file)
@@ -1397,8 +1397,6 @@ ConfigMainWindow::ConfigMainWindow(void)
 
        conf_set_changed_callback(conf_changed);
 
-       // Set saveAction's initial state
-       conf_changed();
        configname = xstrdup(conf_get_configname());
 
        QAction *saveAsAction = new QAction("Save &As...", this);
@@ -1904,7 +1902,6 @@ int main(int ac, char** av)
 
        conf_parse(name);
        fixup_rootmenu(&rootmenu);
-       conf_read(NULL);
        //zconfdump(stdout);
 
        configApp = new QApplication(ac, av);
@@ -1916,6 +1913,9 @@ int main(int ac, char** av)
        //zconfdump(stdout);
        configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit()));
        configApp->connect(configApp, SIGNAL(aboutToQuit()), v, SLOT(saveSettings()));
+
+       conf_read(NULL);
+
        v->show();
        configApp->exec();