From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Fri, 16 Oct 2015 01:48:40 +0000 (+0900)
Subject: Evas GL: SW engine CID fixes
X-Git-Tag: v1.16.0-beta2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=561481f6ad0cf9c5c12ee5c6091625120ad4da11;p=platform%2Fupstream%2Fefl.git

Evas GL: SW engine CID fixes

Following previous changes, there was unreachable code.
- CID 1327421
- CID 1327420
---

diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 7002378..d9b8956 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -3093,10 +3093,8 @@ eng_gl_make_current(void *data EINA_UNUSED, void *surface, void *context)
      }
 
    // Unset surface/context
-   if ((!sfc) || (!ctx))
+   if ((!sfc) && (!ctx))
      {
-        if (ctx) ctx->current_sfc = NULL;
-        if (sfc) sfc->current_ctx = NULL;
         eina_tls_set(gl_current_ctx_key, NULL);
         eina_tls_set(gl_current_sfc_key, NULL);
         return 1;