pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-28 13:56:37 +02:00
Code Activity

script: reload a script after upgrade only if it was loaded, set autoload only if the script was auto-loaded (closes #855)

Browse Source
This commit is contained in:
Sébastien Helleu
2016-12-01 19:34:23 +01:00
parent 827c013aa7
commit 4c6d9e14d1
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/script/script-action.c
+13 -2
View File
@@ -506,7 +506,7 @@ script_action_install_process_cb (const void *pointer, void *data,
const char *err)
{
char *pos, *filename, *filename2, str_signal[256];
int quiet, length;
int quiet, auto_load, length;
struct t_script_repo *ptr_script;
/* make C compiler happy */
@@ -543,10 +543,21 @@ script_action_install_process_cb (const void *pointer, void *data,
filename2 = malloc (length);
if (filename2)
{
auto_load = 0;
if (ptr_script->status & SCRIPT_STATUS_INSTALLED)
{
auto_load = (ptr_script->status & SCRIPT_STATUS_AUTOLOADED) ?
1 : 0;
}
else
{
auto_load = weechat_config_boolean (
script_config_scripts_autoload);
}
snprintf (filename2, length,
"%s%s%s",
(quiet && weechat_config_boolean (script_config_look_quiet_actions)) ? "-q " : "",
(weechat_config_boolean (script_config_scripts_autoload)) ? "-a " : "",
(auto_load) ? "-a " : "",
filename);
snprintf (str_signal, sizeof (str_signal),
"%s_script_install",