Skip to content

M
magicseteditor
Commit 4d562f20 authored by twanvl's avatar twanvl
Browse files
Options

Fixed bug caused by case sensitivity of filenames in newFileName

parent 1da6fe2b
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
src/util/io/package.cpp
View file @ 4d562f20
...@@ -219,10 +219,11 @@ OutputStreamP Package::openOut(const String& file) { ...@@ -219,10 +219,11 @@ OutputStreamP Package::openOut(const String& file) {
String Package::nameOut(const String& file) { String Package::nameOut(const String& file) {
assert(wxThread::IsMain()); // Writing should only be done from the main thread assert(wxThread::IsMain()); // Writing should only be done from the main thread
FileInfos::iterator it = files.find(file); String name = normalize_internal_filename(file);
FileInfos::iterator it = files.find(name);
if (it == files.end()) { if (it == files.end()) {
// new file // new file
it = addFile(file); it = addFile(name);
} }
// return stream // return stream
if (it->second.wasWritten()) { if (it->second.wasWritten()) {
...@@ -244,6 +245,7 @@ FileName Package::newFileName(const String& prefix, const String& suffix) { ...@@ -244,6 +245,7 @@ FileName Package::newFileName(const String& prefix, const String& suffix) {
name = prefix; name = prefix;
name << ++infix; name << ++infix;
name += suffix; name += suffix;
name = normalize_internal_filename(name);
// check if a file with that name exists // check if a file with that name exists
FileInfos::iterator it = files.find(name); FileInfos::iterator it = files.find(name);
if (it == files.end()) { if (it == files.end()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment