mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-20 01:21:15 +00:00
Don't check subdirectories of valid content subdirectories (#8085)
This commit is contained in:
parent
11f25e4448
commit
8a7035020a
@ -187,6 +187,7 @@
|
|||||||
Bug #8048: Actors can generate negative collision extents and have no collision
|
Bug #8048: Actors can generate negative collision extents and have no collision
|
||||||
Bug #8063: menu_background.bik video with audio freezes the game forever
|
Bug #8063: menu_background.bik video with audio freezes the game forever
|
||||||
Bug #8064: Lua move360 script doesn't respect the enableZoom/disableZoom Camera interface setting
|
Bug #8064: Lua move360 script doesn't respect the enableZoom/disableZoom Camera interface setting
|
||||||
|
Bug #8085: Don't search in scripts or shaders directories for "Select directories you wish to add" menu in launcher
|
||||||
Feature #1415: Infinite fall failsafe
|
Feature #1415: Infinite fall failsafe
|
||||||
Feature #2566: Handle NAM9 records for manual cell references
|
Feature #2566: Handle NAM9 records for manual cell references
|
||||||
Feature #3537: Shader-based water ripples
|
Feature #3537: Shader-based water ripples
|
||||||
|
@ -75,7 +75,10 @@ namespace
|
|||||||
QDir currentDir(path);
|
QDir currentDir(path);
|
||||||
if (!currentDir.entryInfoList(fileFilter, QDir::Files).empty()
|
if (!currentDir.entryInfoList(fileFilter, QDir::Files).empty()
|
||||||
|| !currentDir.entryInfoList(dirFilter, QDir::Dirs | QDir::NoDotAndDotDot).empty())
|
|| !currentDir.entryInfoList(dirFilter, QDir::Dirs | QDir::NoDotAndDotDot).empty())
|
||||||
|
{
|
||||||
dirs.push_back(currentDir.canonicalPath());
|
dirs.push_back(currentDir.canonicalPath());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
for (const auto& subdir : currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot))
|
for (const auto& subdir : currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot))
|
||||||
contentSubdirs(subdir.canonicalFilePath(), dirs);
|
contentSubdirs(subdir.canonicalFilePath(), dirs);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user