From f41de35da13b257874db920220dcee322f57e8fe Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 23 Oct 2016 06:21:09 +0200
Subject: [PATCH] Prevent 'Explicit null dereferenced' warning

---
 runloop.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/runloop.c b/runloop.c
index 41c64760ef..2569016e85 100644
--- a/runloop.c
+++ b/runloop.c
@@ -650,8 +650,10 @@ bool runloop_ctl(enum runloop_ctl_state state, void *data)
                }
 
                runloop_ctl(RUNLOOP_CTL_UNSET_GAME_OPTIONS_ACTIVE, NULL);
-               runloop_core_options =
-                  core_option_manager_new(options_path, vars);
+
+               if (!string_is_empty(options_path))
+                  runloop_core_options =
+                     core_option_manager_new(options_path, vars);
             }
 
          }