[Commits] [SCM] claws branch, master, updated. 3.13.2-209-gca90fcd
ticho at claws-mail.org
ticho at claws-mail.org
Thu Jul 28 11:40:03 CEST 2016
The branch, master has been updated
via ca90fcd9d2b67fd53a8da274e936efbe84d602a5 (commit)
from 6dba6cdee29faee2253451e2ba27e5a5f36a28c7 (commit)
Summary of changes:
src/main.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
- Log -----------------------------------------------------------------
commit ca90fcd9d2b67fd53a8da274e936efbe84d602a5
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Thu Jul 28 11:38:32 2016 +0200
Do not run config update routine on first run.
The newly created configuration is already up to date.
diff --git a/src/main.c b/src/main.c
index 11ce45e..747b7d2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1458,18 +1458,19 @@ int main(int argc, char *argv[])
g_slist_free(plug_list);
}
- if (prefs_update_config_version() < 0) {
- exit_claws(mainwin);
-#ifdef G_OS_WIN32
- win32_close_log();
-#endif
- exit(0);
- }
-
if (never_ran) {
prefs_common_write_config();
plugin_load_standard_plugins ();
+ } else {
+ if (prefs_update_config_version() < 0) {
+ exit_claws(mainwin);
+#ifdef G_OS_WIN32
+ win32_close_log();
+#endif
+ exit(0);
+ }
}
+
/* if not crashed, show window now */
if (!mainwin_shown) {
/* apart if something told not to show */
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list