Skip to content

Commit f516fc2

Browse files
committed
nemo-view.c: Move call added to last commit to nemo_view_stop_loading.
real_update_menus can get called after the menu is showing as a result of nemo_file_get_volume_free_space() being used to update the bottom status bar. This only happens if the free space changes, however this ends up happening frequently due to logging and other things. This can end up removing the extension items just after the menu becomes visible.
1 parent 001912f commit f516fc2

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/nemo-view.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9606,7 +9606,6 @@ update_configurable_context_menu_items (NemoView *view)
96069606
static void
96079607
real_update_menus (NemoView *view)
96089608
{
9609-
GtkUIManager *ui_manager;
96109609
GList *selection, *l;
96119610
gint selection_count;
96129611
const char *tip, *label;
@@ -10036,11 +10035,6 @@ real_update_menus (NemoView *view)
1003610035
!selection_contains_recent && !selection_contains_trash);
1003710036
}
1003810037

10039-
ui_manager = nemo_window_get_ui_manager (view->details->window);
10040-
nemo_ui_unmerge_ui (ui_manager,
10041-
&view->details->extensions_menu_merge_id,
10042-
&view->details->extensions_menu_action_group);
10043-
1004410038
update_configurable_context_menu_items (view);
1004510039

1004610040
nemo_file_list_free (selection);
@@ -10610,6 +10604,15 @@ nemo_view_stop_loading (NemoView *view)
1061010604
{
1061110605
g_return_if_fail (NEMO_IS_VIEW (view));
1061210606

10607+
if (view->details->window) {
10608+
GtkUIManager *ui_manager;
10609+
10610+
ui_manager = nemo_window_get_ui_manager (view->details->window);
10611+
nemo_ui_unmerge_ui (ui_manager,
10612+
&view->details->extensions_menu_merge_id,
10613+
&view->details->extensions_menu_action_group);
10614+
}
10615+
1061310616
unschedule_display_of_pending_files (view);
1061410617
reset_update_interval (view);
1061510618

0 commit comments

Comments
 (0)