Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-10-04 19:27:56 +02:00
commit 0eeae6c652
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
View file

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

6
code/ryzom/tools/client/ryzom_installer/src/utils.cpp
View file

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