summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/softlist_dev.cpp
diff options
context:
space:
mode:
author Vas Crabb <cuavas@users.noreply.github.com>2016-08-11 22:13:20 +1000
committer GitHub <noreply@github.com>2016-08-11 22:13:20 +1000
commitc0b51e99f1602c16e71a8248746528eeefd61e07 (patch)
treeb2bffa190ac544d964545568df39552eefe146f9 /src/emu/softlist_dev.cpp
parent74fc59935f8c80fd1477c7c447c3b1090a6bdf66 (diff)
parent549df5e6b0591c04a1f442586cf4f3786aafe991 (diff)
Merge pull request #1228 from npwoods/fix_softlist_device_description
Fixed an issue that caused softlist device descriptions to be blank
Diffstat (limited to 'src/emu/softlist_dev.cpp')
-rw-r--r--src/emu/softlist_dev.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/softlist_dev.cpp b/src/emu/softlist_dev.cpp
index 013f90c779c..ce6d96a24d2 100644
--- a/src/emu/softlist_dev.cpp
+++ b/src/emu/softlist_dev.cpp
@@ -229,9 +229,9 @@ void software_list_device::display_matches(const machine_config &config, const c
{
// different output depending on original system or compatible
if (swlistdev.list_type() == SOFTWARE_LIST_ORIGINAL_SYSTEM)
- osd_printf_error("* Software list \"%s\" (%s) matches: \n", swlistdev.list_name().c_str(), swlistdev.description());
+ osd_printf_error("* Software list \"%s\" (%s) matches: \n", swlistdev.list_name().c_str(), swlistdev.description().c_str());
else
- osd_printf_error("* Compatible software list \"%s\" (%s) matches: \n", swlistdev.list_name().c_str(), swlistdev.description());
+ osd_printf_error("* Compatible software list \"%s\" (%s) matches: \n", swlistdev.list_name().c_str(), swlistdev.description().c_str());
// print them out
for (auto &match : matches)
@@ -297,7 +297,7 @@ void software_list_device::parse()
{
// parse if no error
std::ostringstream errs;
- softlist_parser parser(m_file, m_description, m_infolist, errs);
+ softlist_parser parser(m_file, m_file.filename(), m_description, m_infolist, errs);
m_file.close();
m_errors = errs.str();
}