Fix SDL rw op

midi.c

@@ -49,7 +49,7 @@ MIDI_Play(
 
 	if (gConfig.fIsWIN95)
 	{
-		g_pMidi = native_midi_loadsong(va("%s/musics/%.3d.mid", PAL_PREFIX, iNumRIX));
+		g_pMidi = native_midi_loadsong(va("%s/Musics/%.3d.mid", PAL_PREFIX, iNumRIX));
 	}
 
 	if (!g_pMidi)

win32/native_midi.cpp

@@ -240,7 +240,13 @@ NativeMidiSong *native_midi_loadsong(const char *midifile)
 {
 	/* Attempt to load the midi file */
 	auto rw = SDL_RWFromFile(midifile, "rb");
-	return native_midi_loadsong_RW(rw);
+	if (rw)
+	{
+		auto song = native_midi_loadsong_RW(rw);
+		SDL_RWclose(rw);
+		return song;
+	}
+	return nullptr;
 }
 
 NativeMidiSong *native_midi_loadsong_RW(SDL_RWops *rw)
@@ -293,10 +299,11 @@ void native_midi_start(NativeMidiSong *song, int looping)
 			} while (song->Position < song->Size && song->Events[song->Position].deltaTime == 0);
 			if (song->Position < song->Size)
 			{
+				auto mutex = std::unique_lock<std::mutex>(song->Mutex);
 				time += std::chrono::system_clock::duration(song->Events[song->Position].DeltaTimeAsTick(song->ppq));
 				while (song->Playing)
 				{
-					if (song->Stop.wait_until(std::unique_lock<std::mutex>(song->Mutex), time) == std::cv_status::timeout)
+					if (song->Stop.wait_until(mutex, time) == std::cv_status::timeout)
 						break;
 				}
 			}

winrt/native_midi.cpp

@@ -220,8 +220,14 @@ int native_midi_detect()
 NativeMidiSong *native_midi_loadsong(const char *midifile)
 {
 	/* Attempt to load the midi file */
-	std::unique_ptr<SDL_RWops> rw(SDL_RWFromFile(midifile, "rb"));
-	return rw ? native_midi_loadsong_RW(rw.get()) : nullptr;
+	auto rw = SDL_RWFromFile(midifile, "rb");
+	if (rw)
+	{
+		auto song = native_midi_loadsong_RW(rw);
+		SDL_RWclose(rw);
+		return song;
+	}
+	return nullptr;
 }
 
 NativeMidiSong *native_midi_loadsong_RW(SDL_RWops *rw)
@@ -274,10 +280,11 @@ void native_midi_start(NativeMidiSong *song, int looping)
 			} while (song->Position < song->Size && song->Events[song->Position].deltaTime == 0);
 			if (song->Position < song->Size)
 			{
+				auto mutex = std::unique_lock<std::mutex>(song->Mutex);
 				time += std::chrono::system_clock::duration(song->Events[song->Position].DeltaTimeAsTick(song->ppq));
 				while (song->Playing)
 				{
-					if (song->Stop.wait_until(std::unique_lock<std::mutex>(song->Mutex), time) == std::cv_status::timeout)
+					if (song->Stop.wait_until(mutex, time) == std::cv_status::timeout)
 						break;
 				}
 			}