Ticket #2669: fixed broken directory reloading.
Bug was introduced in 5c252726f1b52863a75b0118603a0e053923eded. Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Этот коммит содержится в:
родитель
14973a6b02
Коммит
83ee61254b
@ -995,13 +995,13 @@ filter_cmd (void)
|
|||||||
void
|
void
|
||||||
reread_cmd (void)
|
reread_cmd (void)
|
||||||
{
|
{
|
||||||
panel_update_flags_t flag = UP_OPTIMIZE;
|
panel_update_flags_t flag = UP_ONLY_CURRENT;
|
||||||
|
|
||||||
if (!current_panel->is_panelized && get_current_type () == view_listing &&
|
if (get_current_type () == view_listing && get_other_type () == view_listing
|
||||||
get_other_type () == view_listing && strcmp (current_panel->cwd, other_panel->cwd) == 0)
|
&& strcmp (current_panel->cwd, other_panel->cwd) == 0)
|
||||||
flag |= UP_RELOAD | UP_ONLY_CURRENT;
|
flag = UP_OPTIMIZE;
|
||||||
|
|
||||||
update_panels (flag, UP_KEEPSEL);
|
update_panels (UP_RELOAD | flag, UP_KEEPSEL);
|
||||||
repaint_screen ();
|
repaint_screen ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3437,7 +3437,10 @@ update_one_panel (int which, panel_update_flags_t flags, const char *current_fil
|
|||||||
if (get_display_type (which) == view_listing)
|
if (get_display_type (which) == view_listing)
|
||||||
{
|
{
|
||||||
WPanel *panel;
|
WPanel *panel;
|
||||||
|
|
||||||
panel = (WPanel *) get_panel_widget (which);
|
panel = (WPanel *) get_panel_widget (which);
|
||||||
|
if (panel->is_panelized)
|
||||||
|
flags &= ~UP_RELOAD;
|
||||||
update_one_panel_widget (panel, flags, current_file);
|
update_one_panel_widget (panel, flags, current_file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -4156,6 +4159,7 @@ update_panels (panel_update_flags_t flags, const char *current_file)
|
|||||||
else
|
else
|
||||||
panel = (WPanel *) get_panel_widget (get_other_index ());
|
panel = (WPanel *) get_panel_widget (get_other_index ());
|
||||||
|
|
||||||
|
if (!panel->is_panelized)
|
||||||
ret = mc_chdir (panel->cwd);
|
ret = mc_chdir (panel->cwd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user