summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Helleu <flashcode@flashtux.org>2014-04-03 14:23:31 +0200
committerSébastien Helleu <flashcode@flashtux.org>2014-04-03 14:23:31 +0200
commit2a9bd75eeedbcc54dd17a258f7ba385a8887cd0f (patch)
tree5fba15f0002d142ea0a81cc480a6fa2fa9fc6f70
parent134713c6d1febc7277231665ef621092aa561c83 (diff)
downloadweechat-2a9bd75eeedbcc54dd17a258f7ba385a8887cd0f.zip
core: close .upgrade files before deleting them after /upgrade
-rw-r--r--ChangeLog.asciidoc1
-rw-r--r--src/core/wee-upgrade.c1
-rw-r--r--src/plugins/irc/irc-upgrade.c1
-rw-r--r--src/plugins/relay/relay-upgrade.c1
-rw-r--r--src/plugins/xfer/xfer-upgrade.c1
5 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index df1d5af42..070c2f7cb 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -15,6 +15,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
== Version 0.4.4 (under dev)
+* core: close .upgrade files before deleting them after /upgrade
* core: add default key key[alt--] (toggle filters in current buffer)
(closes #17)
* core: add non-active merged buffers with activity in hotlist (if another
diff --git a/src/core/wee-upgrade.c b/src/core/wee-upgrade.c
index 0e1b6a242..2396fd728 100644
--- a/src/core/wee-upgrade.c
+++ b/src/core/wee-upgrade.c
@@ -769,6 +769,7 @@ upgrade_weechat_load ()
upgrade_file = upgrade_file_new (WEECHAT_UPGRADE_FILENAME, 0);
rc = upgrade_file_read (upgrade_file, &upgrade_weechat_read_cb, NULL);
+ upgrade_file_close (upgrade_file);
if (!hotlist_reset)
gui_hotlist_clear ();
diff --git a/src/plugins/irc/irc-upgrade.c b/src/plugins/irc/irc-upgrade.c
index d77084fea..9f3b62e25 100644
--- a/src/plugins/irc/irc-upgrade.c
+++ b/src/plugins/irc/irc-upgrade.c
@@ -721,6 +721,7 @@ irc_upgrade_load ()
upgrade_file = weechat_upgrade_new (IRC_UPGRADE_FILENAME, 0);
rc = weechat_upgrade_read (upgrade_file, &irc_upgrade_read_cb, NULL);
+ weechat_upgrade_close (upgrade_file);
return rc;
}
diff --git a/src/plugins/relay/relay-upgrade.c b/src/plugins/relay/relay-upgrade.c
index 7221ee808..b6a94f511 100644
--- a/src/plugins/relay/relay-upgrade.c
+++ b/src/plugins/relay/relay-upgrade.c
@@ -241,6 +241,7 @@ relay_upgrade_load ()
upgrade_file = weechat_upgrade_new (RELAY_UPGRADE_FILENAME, 0);
rc = weechat_upgrade_read (upgrade_file, &relay_upgrade_read_cb, NULL);
+ weechat_upgrade_close (upgrade_file);
return rc;
}
diff --git a/src/plugins/xfer/xfer-upgrade.c b/src/plugins/xfer/xfer-upgrade.c
index 69e0d5f2c..9e9c1f26d 100644
--- a/src/plugins/xfer/xfer-upgrade.c
+++ b/src/plugins/xfer/xfer-upgrade.c
@@ -138,6 +138,7 @@ xfer_upgrade_load ()
upgrade_file = weechat_upgrade_new (XFER_UPGRADE_FILENAME, 0);
rc = weechat_upgrade_read (upgrade_file, &xfer_upgrade_read_cb, NULL);
+ weechat_upgrade_close (upgrade_file);
return rc;
}