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_prodos.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_prodos.cpp')
-rw-r--r-- | src/lib/formats/fs_prodos.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/formats/fs_prodos.cpp b/src/lib/formats/fs_prodos.cpp index df13d0a4caa..2ce67301999 100644 --- a/src/lib/formats/fs_prodos.cpp +++ b/src/lib/formats/fs_prodos.cpp @@ -351,9 +351,9 @@ std::vector<dir_entry> impl::root_dir::contents() auto name = blk.rstr(off+1, type & 0xf); type >>= 4; if(type == 0xd) - res.emplace_back(dir_entry(name, dir_entry_type::dir, id)); + res.emplace_back(dir_entry(std::move(name), dir_entry_type::dir, id)); else if(type != 0) - res.emplace_back(dir_entry(name, dir_entry_type::file, id)); + res.emplace_back(dir_entry(std::move(name), dir_entry_type::file, id)); off += 39; id ++; } |