[Commits] [SCM] claws branch, gtk2, updated. 3.20.0-14-gb3c69d22f

[paul at claws-mail.org]

The branch, gtk2 has been updated
       via  b3c69d22f0a9932fff9997357345fe2a91711960 (commit)
       via  1edb1f1b9d1659a1ddb471310649bd7f00b54c28 (commit)
      from  7a5b78812735148500684f4b09b716dc4481e0da (commit)

Summary of changes:
 src/main.c | 1 -
 1 file changed, 1 deletion(-)


- Log -----------------------------------------------------------------
commit b3c69d22f0a9932fff9997357345fe2a91711960
Author: Paul <paul at claws-mail.org>
Date:   Wed Dec 20 13:36:09 2023 +0100

    continue if we can't create a backup of menurc

diff --git a/src/main.c b/src/main.c
index 7afb7c081..5a3d6119a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1256,8 +1256,6 @@ int main(int argc, char *argv[])
 	if (copy_file(userrc, userrc, TRUE) < 0) {
 		g_warning("can't copy message %s to %s.bak",
 			  userrc, userrc);
-		g_free(userrc);		
-		return -1;
 	}
 
 	gtk_accel_map_load (userrc);

commit 1edb1f1b9d1659a1ddb471310649bd7f00b54c28
Author: Paul <paul at claws-mail.org>
Date:   Wed Dec 20 13:33:20 2023 +0100

    add a missed g_free()

diff --git a/src/main.c b/src/main.c
index 18226bd7b..7afb7c081 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1256,7 +1256,8 @@ int main(int argc, char *argv[])
 	if (copy_file(userrc, userrc, TRUE) < 0) {
 		g_warning("can't copy message %s to %s.bak",
 			  userrc, userrc);
-				return -1;
+		g_free(userrc);		
+		return -1;
 	}
 
 	gtk_accel_map_load (userrc);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail