summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Nathan Woods <npwoods@mess.org>2017-08-17 08:17:58 -0400
committer Vas Crabb <cuavas@users.noreply.github.com>2017-08-19 15:59:33 +1000
commit098cfab5b86232e9006d10588ba2b4b55943fde3 (patch)
treef2be08643bd28465f656c3256bba62aab19f36e0
parentb1275ccf6c5db5168052186217baf1ee9fe7a177 (diff)
Fixed MameTesters bug #6621
-rw-r--r--src/emu/machine.h2
-rw-r--r--src/frontend/mame/ui/state.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/emu/machine.h b/src/emu/machine.h
index 178764ab811..4cf274c9617 100644
--- a/src/emu/machine.h
+++ b/src/emu/machine.h
@@ -250,6 +250,7 @@ public:
u32 rand();
std::string describe_context() const;
std::string compose_saveload_filename(std::string &&base_filename, const char **searchpath = nullptr);
+ std::string get_statename(const char *statename_opt) const;
// CPU information
cpu_device * firstcpu; // first CPU
@@ -293,7 +294,6 @@ private:
template <typename T> struct is_null<T *> { template <typename U> static bool value(U &&x) { return !x; } };
void start();
void set_saveload_filename(std::string &&filename);
- std::string get_statename(const char *statename_opt) const;
void handle_saveload();
void soft_reset(void *ptr = nullptr, s32 param = 0);
std::string nvram_filename(device_t &device) const;
diff --git a/src/frontend/mame/ui/state.cpp b/src/frontend/mame/ui/state.cpp
index 474319cd6fa..27bbe24ed00 100644
--- a/src/frontend/mame/ui/state.cpp
+++ b/src/frontend/mame/ui/state.cpp
@@ -353,15 +353,16 @@ const menu_load_save_state_base::file_entry &menu_load_save_state_base::file_ent
//-------------------------------------------------
-// is_present
+// state_name
//-------------------------------------------------
std::string menu_load_save_state_base::state_directory() const
{
+ const char *stateopt = machine().options().state_name();
return util::string_format("%s%s%s",
machine().options().state_directory(),
PATH_SEPARATOR,
- machine().system().name);
+ machine().get_statename(stateopt));
}