Made requested changes.

openai · Jul 19, 2019 · f0c96be · f0c96be
1 parent c76ad34
commit f0c96be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/emulator.cpp b/src/emulator.cpp
@@ -58,6 +58,9 @@ Emulator::Emulator() {
 }
 
 Emulator::~Emulator() {
+	if (m_corePath) {
+		free(m_corePath);
+	}
 	if (m_romLoaded) {
 		unloadRom();
 	}
@@ -360,7 +363,10 @@ bool Emulator::cbEnvironment(unsigned cmd, void* data) {
 		return false;
 	}
 	case RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY:
-		*reinterpret_cast<const char**>(data) = strdup(corePath().c_str());
+		if (!s_loadedEmulator->m_corePath) {
+			s_loadedEmulator->m_corePath = strdup(corePath().c_str());
+		}
+		*reinterpret_cast<const char**>(data) = s_loadedEmulator->m_corePath;
 		return true;
 	case RETRO_ENVIRONMENT_GET_CAN_DUPE:
 		*reinterpret_cast<bool*>(data) = true;

diff --git a/src/emulator.h b/src/emulator.h
@@ -83,6 +83,8 @@ class Emulator {
 	retro_system_av_info m_avInfo = {};
 	std::vector<retro_memory_descriptor> m_map;
 
+	char* m_corePath = nullptr;
+
 #ifdef _WIN32
 	HMODULE m_coreHandle = nullptr;
 #else