Even more fixes for Microsoft(R) Windows(R) operating system.

Device initalization file dialog doesn't work correctly on Windows.
Make hiding console an option on Windows.
For some dumb reason preset selection dialog refuses to work if no
soundfont is selected.

1 files changed, 4 insertions, 7 deletions

diff --git a/core/qmpmidioutrtmidi.cpp b/core/qmpmidioutrtmidi.cpp
index 6dc9ca6..eeda04b 100644
--- a/core/qmpmidioutrtmidi.cpp
+++ b/core/qmpmidioutrtmidi.cpp
@@ -26,14 +26,16 @@ qmpDeviceInitializer* qmpDeviceInitializer::parse(const char* path)
 {
 	qmpDeviceInitializer *ret=new qmpDeviceInitializer();
 	ret->initseq.eventList.clear();
-	FILE* f=fopen(path, "r");
-	if(!f)return nullptr;
 
 	bool st_inmapping=false;
 	char buf[1024];
 	int ln=0;
 	int cmsb=-1,clsb=-1;
 
+#define err(e) {delete ret;return fprintf(stderr,"line %d: %s",ln,e),nullptr;}
+	FILE* f=fopen(path,"r");
+	if(!f)err("file not found")
+
 	//writing such a bad parser makes me want my money for
 	//the credits from "compiler principles" back...
 	auto h2d=[](char c)->char{return 'F'>=c&&c>='A'?c-'A'+10:'9'>=c&&c>='0'?c-'0':-1;};
@@ -45,7 +47,6 @@ qmpDeviceInitializer* qmpDeviceInitializer::parse(const char* path)
 		(x<0||x>0xff)&&(x=-1);
 		return r==1?x:-1;
 	};
-#define err(e) {delete ret;return fprintf(stderr,"line %d: %s",ln,e),nullptr;}
 	while(fgets(buf,1024,f))
 	{
 		++ln;
@@ -232,17 +233,13 @@ void qmpMidiOutRtMidi::reset(uint8_t ch)
 	if(ch==0xFF)
 	{
 		if(devinit)
-		{
 			for(auto&msg:devinit->initseq.eventList)
 			{
 				if((msg.type&0xF0)==0xF0)
 					extendedMessage(msg.str.length(),msg.str.data());
 				else
-				{
 					basicMessage(msg.type,msg.p1,msg.p2);
-				}
 			}
-		}
 	}
 	else
 	{