summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-01 16:31:09 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-07 12:12:22 -0500
commita2f265d7db43e6466c4bcd99d3c5f622c8fb6c17 (patch)
treef475e1be6afb1aec65edc059f9d9ba0035b78eae
parent49e47ac310fb908d77d8aad19a128d273b729e0c (diff)
-rw-r--r--src/lib/ecore/ecore_main.c5
-rw-r--r--src/lib/elementary/elm_main.c1
2 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c
index 214f73215e..90d1b9739d 100644
--- a/src/lib/ecore/ecore_main.c
+++ b/src/lib/ecore/ecore_main.c
@@ -1132,11 +1132,6 @@ _ecore_main_loop_begin(Eo *obj, Efl_Loop_Data *pd)
1132{ 1132{
1133 if (obj == ML_OBJ) 1133 if (obj == ML_OBJ)
1134 { 1134 {
1135 if (pd->in_loop > 0)
1136 {
1137 ERR("Beginning main loop() inside an existing main loop");
1138 return;
1139 }
1140#ifdef HAVE_SYSTEMD 1135#ifdef HAVE_SYSTEMD
1141 sd_notify(0, "READY=1"); 1136 sd_notify(0, "READY=1");
1142#endif 1137#endif
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 41e75412c2..3600346d3b 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -1098,6 +1098,7 @@ elm_quicklaunch_fork(int argc,
1098 pid_t child; 1098 pid_t child;
1099 int ret; 1099 int ret;
1100 1100
1101 efl_loop_message_process(efl_loop_main_get(EFL_LOOP_CLASS));
1101 if (!qr_main && !qre_main) 1102 if (!qr_main && !qre_main)
1102 { 1103 {
1103 int i; 1104 int i;