cedric pushed a commit to branch enlightenment-0.17.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=08295d29dbc3870d44f6a0d4f29e94f5c761c3db

commit 08295d29dbc3870d44f6a0d4f29e94f5c761c3db
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Dec 5 13:51:08 2014 -0500

    print more descriptive error messages when scanner connection fails, also 
don't exit() here
    
    ref T1612
---
 src/bin/e_fm/e_fm_main_eeze.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c
index 88344dc..36d1ebe 100644
--- a/src/bin/e_fm/e_fm_main_eeze.c
+++ b/src/bin/e_fm/e_fm_main_eeze.c
@@ -617,8 +617,14 @@ _scanner_del(void *data, int type __UNUSED__, 
Ecore_Exe_Event_Del *ev)
    if (data != ecore_exe_data_get(ev->exe)) return ECORE_CALLBACK_PASS_ON;
    if (!svr)
      {
-        INF("scanner connection dead, exiting");
-        exit(1);
+        const char *str = "blame cedric";
+
+        if (ev->exit_code == 1)
+          str = "unable to allocate memory";
+        else if (ev->exit_code == 2)
+          str = "unable to create local socket; check 
\"/$TMPDIR/.ecore_service/\" for stale files";
+        INF("scanner connection dead (%s), exiting", str);
+        _e_fm_main_catch(EFM_MODE_USING_RASTER_MOUNT);
      }
    INF("lost connection to scanner");
    scanner = NULL;

-- 


Reply via email to