If recursion is encountered in the profile parent hierarchy then fall back to the fallback profile instead of an empty one as the fallback profile at least has useful default settings.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=910518
This commit is contained in:
Robert Knight
2009-01-13 13:46:38 +00:00
parent 1e34fc4ba3
commit 6c9f15a409

View File

@@ -139,7 +139,7 @@ Profile::Ptr SessionManager::loadProfile(const QString& shortPath)
if (recursionGuard.contains(path))
{
kWarning() << "Ignoring attempt to load profile recursively from" << path;
return Profile::Ptr();
return _fallbackProfile;
}
else
recursionGuard.push(path);