summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2013-08-27 12:47:51 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2013-10-28 10:57:07 +0900
commit2f2b1c5ad767555eb6e6da226b6a5ac715064845 (patch)
treea17cd177b7a0d4a09fc0b8ef31c7ce550aa8dccd
parent0fe6a35885890b02e09d0bb913ab30f36f96088d (diff)
downloadefl-2f2b1c5ad767555eb6e6da226b6a5ac715064845.tar.gz
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.
-rw-r--r--src/lib/evas/canvas/evas_main.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index bf23273396..101b82f601 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