From 559669fc4a607c4e2bf8f2e5d065785bab76944f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 29 May 2019 16:27:06 +0200
Subject: [PATCH] (dynamic.c) Cleanups
---
dynamic.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/dynamic.c b/dynamic.c
index 770cc3fe08..e6385d9d2c 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -356,13 +356,7 @@ static dylib_t libretro_get_system_info_lib(const char *path,
void (*proc)(struct retro_system_info*);
if (!lib)
- {
- RARCH_ERR("%s: \"%s\"\n",
- msg_hash_to_str(MSG_FAILED_TO_OPEN_LIBRETRO_CORE),
- path);
- RARCH_ERR("Error(s): %s\n", dylib_error());
return NULL;
- }
proc = (void (*)(struct retro_system_info*))
dylib_proc(lib, "retro_get_system_info");
@@ -382,10 +376,8 @@ static dylib_t libretro_get_system_info_lib(const char *path,
set_environ = (void (*)(retro_environment_t))
dylib_proc(lib, "retro_set_environment");
- if (!set_environ)
- return lib;
-
- libretro_get_environment_info(set_environ, load_no_content);
+ if (set_environ)
+ libretro_get_environment_info(set_environ, load_no_content);
}
return lib;
@@ -427,7 +419,13 @@ bool libretro_get_system_info(const char *path,
path, &dummy_info, load_no_content);
if (!lib)
+ {
+ RARCH_ERR("%s: \"%s\"\n",
+ msg_hash_to_str(MSG_FAILED_TO_OPEN_LIBRETRO_CORE),
+ path);
+ RARCH_ERR("Error(s): %s\n", dylib_error());
return false;
+ }
#else
if (load_no_content)
{