summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJekyll Wu <adaptee@gmail.com>2011-08-11 07:39:04 (GMT)
committerKurt Hindenburg <kurt.hindenburg@gmail.com>2011-08-25 12:58:39 (GMT)
commit5f3fd09c27e925c28f78b12ffe173c1e844ebf64 (patch)
treeb509ae5f2f735e49aa1f5c33072b2f143a23e2c6
parent27d65589b4c6a71a08d2d4f674177e96738d56a7 (diff)
When loading profile, do not initially set default profile as parent.
The old code will cause problem if the loaded profile does not specify its parent explicitly. That loaded profile will have current default profile as its parent, which means its behavior changes if another profile is set as the default profile . A good example is the 'Shell' profile. The new code initially sets fallback profile as parent, which guarantees the behavior of 'Shell' profile is stable. BUG: 279863 (cherry picked from commit cb6a87a9b45a24e020e32200ff502790ef70c99a)
-rw-r--r--src/SessionManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/SessionManager.cpp b/src/SessionManager.cpp
index 0db05cd..a0ab6f0 100644
--- a/src/SessionManager.cpp
+++ b/src/SessionManager.cpp
@@ -181,7 +181,7 @@ Profile::Ptr SessionManager::loadProfile(const QString& shortPath)
return Profile::Ptr();
}
- Profile::Ptr newProfile = Profile::Ptr(new Profile(defaultProfile()));
+ Profile::Ptr newProfile = Profile::Ptr(new Profile(fallbackProfile()));
newProfile->setProperty(Profile::Path,path);
QString parentProfilePath;