From 5adf8c44d91dec53040c8a483fc793f6dad97154 Mon Sep 17 00:00:00 2001 From: Bogdan Devichev Date: Mon, 22 Dec 2014 11:37:30 +0200 Subject: [PATCH] Fix of warning created on step 10 and fix of wrong logic of error. --- src/lib/evas/common/evas_model_load.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lib/evas/common/evas_model_load.c b/src/lib/evas/common/evas_model_load.c index e00290e315..bef10ba28c 100644 --- a/src/lib/evas/common/evas_model_load.c +++ b/src/lib/evas/common/evas_model_load.c @@ -38,14 +38,19 @@ void evas_common_load_model_from_file(Evas_3D_Mesh *model, const char *file) { Eina_File *tmp_file = eina_file_open(file, 0); + + if (tmp_file == NULL) + { + ERR("Failed to open file %s\n", file); + ERR("Failed to initialize loader."); + return; + } + Eina_File *e_file = eina_file_dup(tmp_file); if (e_file == NULL) { - ERR("Failed to open file %s\n", file); eina_file_close(tmp_file); - eina_file_close(e_file); - e_file = NULL; file = NULL; ERR("Failed to initialize loader."); return; @@ -66,9 +71,6 @@ evas_common_load_model_from_eina_file(Evas_3D_Mesh *model, Eina_File *file) if (e_file == NULL) { - ERR("Failed to open file %s\n", file); - eina_file_close(e_file); - e_file = NULL; ERR("Failed to initialize loader."); return; }