summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHannes Janetzek <hannes.janetzek@gmail.com>2012-12-22 01:03:01 +0000
committerHannes Janetzek <hannes.janetzek@gmail.com>2012-12-22 01:03:01 +0000
commitedff7270a54f82458ac3593b4724aa25a25a5f7b (patch)
tree7c21f504e9fa1834cb95fe00063c4c1ff92d88b5
parent9473ab1ccdf80a35a9bfcc161a47e853f6cefa60 (diff)
downloadenlightenment-edff7270a54f82458ac3593b4724aa25a25a5f7b.tar.gz
e17/fileman: fix segv: ni->monitor could be NULL
SVN revision: 81629
-rw-r--r--src/modules/fileman/e_fwin_nav.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/fileman/e_fwin_nav.c b/src/modules/fileman/e_fwin_nav.c
index 6a14d08d8f..b5e29617ab 100644
--- a/src/modules/fileman/e_fwin_nav.c
+++ b/src/modules/fileman/e_fwin_nav.c
@@ -92,7 +92,7 @@ _event_deleted(Nav_Item *ni, int type, void *e)
if (type == EIO_MONITOR_ERROR)
{
//donteven.jpg
- eio_monitor_del(ni->monitor);
+ if (ni->monitor) eio_monitor_del(ni->monitor);
ni->monitor = eio_monitor_stringshared_add(ni->path);
return ECORE_CALLBACK_RENEW;
}
@@ -673,6 +673,7 @@ _box_button_append(Instance *inst, const char *label, Edje_Signal_Cb func)
}
ni->path = eina_stringshare_add(path);
ni->monitor = eio_monitor_stringshared_add(ni->path);
+ if (!ni->monitor) DBG("failed to add file monitor: %s", ni->path);
E_LIST_HANDLER_APPEND(ni->handlers, EIO_MONITOR_SELF_DELETED, _event_deleted, ni);
E_LIST_HANDLER_APPEND(ni->handlers, EIO_MONITOR_SELF_RENAME, _event_deleted, ni);
E_LIST_HANDLER_APPEND(ni->handlers, EIO_MONITOR_ERROR, _event_deleted, ni);