Merged master to savestate branch

This commit is contained in:
tomcw
2015-09-13 11:39:58 +01:00
41 changed files with 2764 additions and 1432 deletions
+1 -1
View File
@@ -1048,7 +1048,7 @@ DWORD WINAPI CSuperSerialCard::CommThread(LPVOID lpParameter)
sprintf(szDbg, "CommThread: Err=Other (0x%08X): InQueue=0x%08X, OutQueue=0x%08X\n", dwErrors, Stat.cbInQue, Stat.cbOutQue);
OutputDebugString(szDbg);
if (g_fh)
fprintf(g_fh, szDbg);
fprintf(g_fh, "%s", szDbg);
}
return -1;
}