diff options
| author | 2016-06-18 17:15:17 +0200 | |
|---|---|---|
| committer | 2016-06-18 17:15:17 +0200 | |
| commit | b4beaa37b744c8b2804ff398e373e035a7e8941c (patch) | |
| tree | 93b7a1edcfb25197fce1028959f1f494fa3d461b /src/emu/machine.cpp | |
| parent | 0213201d1d902f7f166afd8f0ded227b009dfc07 (diff) | |
| parent | 1ad39fd8250863ff4c7f90e84d971db006085a17 (diff) | |
Merge remote-tracking branch 'mainline/master'
Diffstat (limited to 'src/emu/machine.cpp')
| -rw-r--r-- | src/emu/machine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index 0bb7ac0ba37..4759432ff00 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -377,9 +377,9 @@ int running_machine::run(bool quiet) osd_printf_error("Error performing a late bind of type %s to %s\n", btex.m_actual_type.name(), btex.m_target_type.name()); error = EMU_ERR_FATALERROR; } - catch (add_exception &aex) + catch (tag_add_exception &aex) { - osd_printf_error("Tag '%s' already exists in tagged_list\n", aex.tag()); + osd_printf_error("Tag '%s' already exists in tagged map\n", aex.tag()); error = EMU_ERR_FATALERROR; } catch (std::exception &ex) |
