From 1a324754fd886cbb03c09e7cba81d5ad36938143 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 27 Aug 2013 12:47:51 +0900 Subject: [PATCH] evas/cserve2: Modify usage of EVAS_CSERVE2 env Check the value of "EVAS_CSERVE2" instead of just checking if it is defined in the environment. So we can set to 0 to disable. --- src/lib/evas/canvas/evas_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index bf23273..101b82f 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -55,7 +55,11 @@ evas_init(void) if (!evas_async_events_init()) goto shutdown_module; #ifdef EVAS_CSERVE2 - if (getenv("EVAS_CSERVE2")) evas_cserve2_init(); + { + const char *env; + env = getenv("EVAS_CSERVE2"); + if (env && atoi(env)) evas_cserve2_init(); + } #endif _evas_preload_thread_init(); @@ -96,7 +100,7 @@ evas_shutdown(void) EINA_LOG_STATE_SHUTDOWN); #ifdef EVAS_CSERVE2 - if (getenv("EVAS_CSERVE2")) + if (evas_cserve2_use_get()) evas_cserve2_shutdown(); #endif -- 2.7.4