Attachment #893466 for bug #932254

View | Details | Raw Unified | Return to bug 932254
Collapse All | Expand All

Lines 806-812 Link Here

(-)source/graphics/TextureManager.cpp (-1 / +1 lines)
806	files.push_back(f);	806	files.push_back(f);
807	p = p / GetWstringFromWpath(*it);	807	p = p / GetWstringFromWpath(*it);
808	}	808	}
809	return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.leaf()), files);	809	return m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.filename()), files);
810	}	810	}
811		811
812	/**	812	/**

Lines 229-235 Link Here

(-)source/lib/file/file_system.cpp (+4 lines)
229	try	229	try
230	{	230	{
231	if(override_if_exists)	231	if(override_if_exists)
		232	#if BOOST_VERSION >=107400
		233	fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_options::overwrite_existing);
		234	#else
232	fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_option::overwrite_if_exists);	235	fs::copy_file(fs::path(path.string()), fs::path(newPath.string()), boost::filesystem::copy_option::overwrite_if_exists);
		236	#endif
233	else	237	else
234	fs::copy_file(fs::path(path.string()), fs::path(newPath.string()));	238	fs::copy_file(fs::path(path.string()), fs::path(newPath.string()));
235	}	239	}

Return to bug 932254