Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
kervala 8 years ago
commit 0eeae6c652

@ -237,6 +237,9 @@ void COperationDialog::updateAddRemoveComponents()
// remove profiles that didn't exist
profilesToAdd.removeAll(profile.id);
// delete all shortcuts, we'll recreate them later
profile.deleteShortcuts();
}
const CServer &defaultServer = config->getServer();
@ -360,7 +363,7 @@ void COperationDialog::processUpdateProfilesNextStep()
}
}
// recreate shortcuts
// recreate all shortcuts
foreach(const CProfile &profile, config->getProfiles())
{
profile.createShortcuts();

@ -169,6 +169,12 @@ bool createShortcut(const QString &shortcut, const QString &name, const QString
// Save the link by calling IPersistFile::Save.
hres = ppf->Save(qToWide(QDir::toNativeSeparators(path)), TRUE);
if (FAILED(hres))
{
qDebug() << "Unable to create shortcut" << path;
}
ppf->Release();
}

Loading…
Cancel
Save