summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Lefebvre <[email protected]>2015-11-20 15:11:47 +0000
committerClement Lefebvre <[email protected]>2015-11-20 15:11:47 +0000
commit0eaf1d0019b1cb4da4b87f6e2e034ec7e9979736 (patch)
tree7d79f9fd5c511f9b3a5cfef772c13e07b7e97b1b
parent88d2ff05f2a5f4c31a8012290ab3ef671d3b48a6 (diff)
downloadcaja-0eaf1d0019b1cb4da4b87f6e2e034ec7e9979736.tar.bz2
caja-0eaf1d0019b1cb4da4b87f6e2e034ec7e9979736.tar.xz
Fixed caja flooding .xsession-errors with "caja_menu_provider_get_background_items: assertion 'CAJA_IS_MENU_PROVIDER (provider)' failed"
-rw-r--r--libcaja-extension/caja-menu-provider.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libcaja-extension/caja-menu-provider.c b/libcaja-extension/caja-menu-provider.c
index 0c47dd13..7198b8c3 100644
--- a/libcaja-extension/caja-menu-provider.c
+++ b/libcaja-extension/caja-menu-provider.c
@@ -115,7 +115,10 @@ caja_menu_provider_get_background_items (CajaMenuProvider *provider,
GtkWidget *window,
CajaFileInfo *current_folder)
{
- g_return_val_if_fail (CAJA_IS_MENU_PROVIDER (provider), NULL);
+ if (!CAJA_IS_MENU_PROVIDER (provider)) {
+ return NULL;
+ }
+
g_return_val_if_fail (CAJA_IS_FILE_INFO (current_folder), NULL);
if (CAJA_MENU_PROVIDER_GET_IFACE (provider)->get_background_items)