diff options
author | 2022-06-14 16:33:21 +1000 | |
---|---|---|
committer | 2022-06-14 16:33:21 +1000 | |
commit | 1f26ec6836364ef523aa4e375c63186bd8fe323f (patch) | |
tree | 883f691395a7fbe71865a624844942d28124d7a8 /src/lib/formats/fs_oric_jasmin.cpp | |
parent | 4a4b718bc9d32b4cd55a90762c960165be2f6043 (diff) | |
parent | 6741eca4d61627072710dc86f458f34a3acf7c5c (diff) |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# scripts/build/verinfo.py
# scripts/resources/windows/mame/mame.rc
# scripts/src/main.lua
# src/mame/drivers/8080bw.cpp
Diffstat (limited to 'src/lib/formats/fs_oric_jasmin.cpp')
-rw-r--r-- | src/lib/formats/fs_oric_jasmin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/formats/fs_oric_jasmin.cpp b/src/lib/formats/fs_oric_jasmin.cpp index 28c13ab634f..361f40332ea 100644 --- a/src/lib/formats/fs_oric_jasmin.cpp +++ b/src/lib/formats/fs_oric_jasmin.cpp @@ -286,10 +286,10 @@ std::vector<dir_entry> impl::root_dir::contents() std::string fname = read_file_name(bdir.rodata()+off+3); bool system = ref == 0 && id == 0 && bdir.r32b(off+0xb) == 0x2e535953; if(system) - res.emplace_back(dir_entry(fname, dir_entry_type::system_file, 0)); + res.emplace_back(dir_entry(std::move(fname), dir_entry_type::system_file, 0)); else if(m_fs.ref_valid(ref)) - res.emplace_back(dir_entry(fname, dir_entry_type::file, id)); + res.emplace_back(dir_entry(std::move(fname), dir_entry_type::file, id)); id++; } |