From a8080f14a9c75a1175976ee8d0cd17c677b55119 Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@indvikleren.dk>
Date: Wed, 21 Mar 2018 17:12:29 +0100
Subject: Change: DOS music loading for non-Windows music drivers

---
 src/music/extmidi.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/music/extmidi.cpp')

diff --git a/src/music/extmidi.cpp b/src/music/extmidi.cpp
index c532e9d44..9d07761b7 100644
--- a/src/music/extmidi.cpp
+++ b/src/music/extmidi.cpp
@@ -18,6 +18,7 @@
 #include "../gfx_func.h"
 #include "extmidi.h"
 #include "../base_media_base.h"
+#include "midifile.hpp"
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -86,10 +87,11 @@ void MusicDriver_ExtMidi::Stop()
 
 void MusicDriver_ExtMidi::PlaySong(const MusicSongInfo &song)
 {
-	if (song.filetype != MTT_STANDARDMIDI) return;
-
-	strecpy(this->song, song.filename, lastof(this->song));
-	this->DoStop();
+	std::string filename = MidiFile::GetSMFFile(song);
+	if (!filename.empty()) {
+		strecpy(this->song, filename.c_str(), lastof(this->song));
+		this->DoStop();
+	}
 }
 
 void MusicDriver_ExtMidi::StopSong()
-- 
cgit v1.2.3-54-g00ecf