Commit 2663d9c7 authored by Kurt Hindenburg's avatar Kurt Hindenburg

Allow --profile=full path to work again.

After 8240973b, using full paths in
--profile didn't work.  This fixes that issue.

It will save the full profile path for favorites and shortcuts if the
profile is not under the normal KDE konsole area.

CCBUG: 283102
parent f28b60ba
......@@ -473,7 +473,16 @@ void ProfileManager::saveShortcuts()
QString profileName;
if (fileInfo.isAbsolute())
{
profileName = fileInfo.fileName();
// Check to see if file is under KDE's data locations. If not,
// store full path.
QString location = KGlobal::dirs()->locate("data",
"konsole/"+fileInfo.fileName());
if (location.isEmpty())
{
profileName = iter.value().profilePath;
} else {
profileName = fileInfo.fileName();
}
} else {
profileName = iter.value().profilePath;
}
......@@ -550,7 +559,16 @@ void ProfileManager::saveFavorites()
if (fileInfo.isAbsolute())
{
profileName = fileInfo.fileName();
// Check to see if file is under KDE's data locations. If not,
// store full path.
QString location = KGlobal::dirs()->locate("data",
"konsole/"+fileInfo.fileName());
if (location.isEmpty())
{
profileName = profile->path();
} else {
profileName = fileInfo.fileName();
}
} else {
profileName = profile->path();
}
......
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