Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h handlers.c session.c
Log Message:
Fix exit/restart from GSOD.
===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -3 -r1.557 -r1.558
--- E.h 3 Jun 2006 14:11:33 -0000 1.557
+++ E.h 11 Jul 2006 23:17:19 -0000 1.558
@@ -500,6 +500,7 @@
char restart;
char xselect;
char exiting;
+ char in_signal_handler;
char save_ok;
char coredump;
int exit_mode;
===================================================================
RCS file: /cvs/e/e16/e/src/handlers.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- handlers.c 12 May 2006 13:10:16 -0000 1.54
+++ handlers.c 11 Jul 2006 23:17:19 -0000 1.55
@@ -34,6 +34,8 @@
static int loop_count = 0;
int status;
+ Mode.wm.in_signal_handler = 1;
+
if (EventDebug(EDBUG_TYPE_SESSION))
Eprintf("SignalHandler signal=%d\n", sig);
@@ -121,6 +123,8 @@
;
break;
}
+
+ Mode.wm.in_signal_handler = 0;
}
static void
===================================================================
RCS file: /cvs/e/e16/e/src/session.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- session.c 3 Jun 2006 23:23:43 -0000 1.127
+++ session.c 11 Jul 2006 23:17:19 -0000 1.128
@@ -673,7 +673,7 @@
Eprintf("SessionExit: mode=%d(%d) prm=%s\n", mode, Mode.wm.exit_mode,
param);
- if (Mode.wm.startup)
+ if (Mode.wm.startup || Mode.wm.in_signal_handler)
goto done;
switch (mode)
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
