pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 23:36:37 +02:00
Code Activity

Fix restore of hotlist after /upgrade

Browse Source
This commit is contained in:
Sebastien Helleu
2009-10-03 10:25:13 +02:00
parent 9116131fde
commit 427419dcd0
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-upgrade.c
+1 -1
View File
@@ -542,7 +542,7 @@ upgrade_weechat_read_cb (void *data,
hotlist_reset = 1;
}
plugin_name = infolist_string (infolist, "plugin_name");
buffer_name = infolist_string (infolist, "plugin_name");
buffer_name = infolist_string (infolist, "buffer_name");
if (plugin_name && buffer_name)
{
ptr_buffer = gui_buffer_search_by_name (plugin_name,
src/gui/gui-buffer.c
+12 -4
View File
@@ -1210,15 +1210,23 @@ gui_buffer_search_by_name (const char *plugin, const char *name)
plugin_match = 1;
if (plugin && plugin[0])
{
if (ptr_buffer->plugin)
if (ptr_buffer->plugin_name_for_upgrade)
{
if (strcmp (plugin, ptr_buffer->plugin->name) != 0)
if (strcmp (plugin, ptr_buffer->plugin_name_for_upgrade) != 0)
plugin_match = 0;
}
else
{
if (strcmp (plugin, PLUGIN_CORE) != 0)
plugin_match = 0;
if (ptr_buffer->plugin)
{
if (strcmp (plugin, ptr_buffer->plugin->name) != 0)
plugin_match = 0;
}
else
{
if (strcmp (plugin, PLUGIN_CORE) != 0)
plugin_match = 0;
}
}
}
if (plugin_match && (strcmp (ptr_buffer->name, name) == 0))