Fix dlclose and tests (#474)

libretro · Nov 12, 2021 · 6cefe03 · 6cefe03
1 parent 038765b
commit 6cefe03
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/core/core_test.go b/core/core_test.go
@@ -56,8 +56,7 @@ func Test_coreLoad(t *testing.T) {
 		}
 	})
 
-	state.Core.UnloadGame()
-	state.Core.Deinit()
+	Unload()
 	state.GamePath = ""
 	state.Verbose = false
 }

diff --git a/libretro/libretro.go b/libretro/libretro.go
@@ -476,6 +476,7 @@ func (core *Core) Deinit() {
 	inputState = nil
 	log = nil
 	getTimeUsec = nil
+	core.DlClose()
 }
 
 // Run runs the game for one video frame.

diff --git a/libretro/libretro_notwindows.go b/libretro/libretro_notwindows.go
@@ -63,3 +63,9 @@ func DlOpen(path string) (unsafe.Pointer, error) {
 	}
 	return h, nil
 }
+
+// DlClose closes a dynamic library
+func (core *Core) DlClose() {
+	C.dlclose(core.handle)
+}
+
diff --git a/libretro/libretro_windows.go b/libretro/libretro_windows.go
@@ -46,3 +46,9 @@ func (core *Core) DlSym(name string) unsafe.Pointer {
 func DlOpen(path string) (*syscall.DLL, error) {
 	return syscall.LoadDLL(path)
 }
+
+// DlClose closes a dynamic library
+func (core *Core) DlClose() {
+	core.handle.Release()
+}
+