Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Different version of OSX segfault fix (nw)

Browse Source
This commit is contained in:
Wilbert Pol 2014-06-23 20:02:16 +00:00
parent 65cd55ff6b
commit 0a6b226deb
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/clifront.c
View File

@ -194,7 +194,7 @@ int cli_frontend::execute(int argc, char **argv)
if (!found)
{
software_list_device::display_matches(config, NULL, m_options.software_name());
throw emu_fatalerror(MAMERR_FATALERROR, "");
throw emu_fatalerror(MAMERR_FATALERROR, NULL);
}
}

32
src/emu/emucore.h
View File

@ -290,33 +290,45 @@ public:
emu_fatalerror(const char *format, ...) ATTR_PRINTF(2,3)
: code(0)
{
va_list ap;
va_start(ap, format);
vsprintf(text, format, ap);
va_end(ap);
if (format != NULL)
{
va_list ap;
va_start(ap, format);
vsprintf(text, format, ap);
va_end(ap);
}
osd_break_into_debugger(text);
}
emu_fatalerror(const char *format, va_list ap)
: code(0)
{
vsprintf(text, format, ap);
if (format != NULL)
{
vsprintf(text, format, ap);
}
osd_break_into_debugger(text);
}
emu_fatalerror(int _exitcode, const char *format, ...) ATTR_PRINTF(3,4)
: code(_exitcode)
{
va_list ap;
va_start(ap, format);
vsprintf(text, format, ap);
va_end(ap);
if (format != NULL)
{
va_list ap;
va_start(ap, format);
vsprintf(text, format, ap);
va_end(ap);
}
}
emu_fatalerror(int _exitcode, const char *format, va_list ap)
: code(_exitcode)
{
vsprintf(text, format, ap);
if (format != NULL)
{
vsprintf(text, format, ap);
}
}
const char *string() const { return text; }