aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-17 13:01:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Conflicts with member variables, see #279

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-09-21 09:54:31 +02:00
parent 933bda5fbb
commit cd20d2e486
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/ryzom/tools/client/ryzom_installer/src/profile.cpp
View file

@ -65,19 +65,19 @@ void CProfile::createShortcuts() const
{ {
const CServer &s = CConfigFile::getInstance()->getServer(server); const CServer &s = CConfigFile::getInstance()->getServer(server);
QString executable = getClientFullPath(); QString exe = getClientFullPath();
QString workingDir = s.getDirectory(); QString workingDir = s.getDirectory();
QString arguments = QString("--profile %1").arg(id); QString profileArguments = QString("--profile %1").arg(id);
// append custom arguments // append custom arguments
if (!arguments.isEmpty()) arguments += QString(" %1").arg(arguments); if (!arguments.isEmpty()) profileArguments += QString(" %1").arg(arguments);
QString icon; QString icon;
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
// under Windows, icon is included in executable // under Windows, icon is included in executable
icon = executable; icon = exe;
#else #else
// icon is in the same directory as client // icon is in the same directory as client
icon = s.getDirectory() + "/ryzom_client.png"; icon = s.getDirectory() + "/ryzom_client.png";
@ -88,7 +88,7 @@ void CProfile::createShortcuts() const
QString shortcut = getClientDesktopShortcutFullPath(); QString shortcut = getClientDesktopShortcutFullPath();
// create desktop shortcut // create desktop shortcut
createLink(shortcut, name, executable, arguments, icon, workingDir); createLink(shortcut, name, exe, profileArguments, icon, workingDir);
} }
if (menuShortcut) if (menuShortcut)
@ -96,7 +96,7 @@ void CProfile::createShortcuts() const
QString shortcut = getClientMenuShortcutFullPath(); QString shortcut = getClientMenuShortcutFullPath();
// create menu shortcut // create menu shortcut
createLink(shortcut, name, executable, arguments, icon, workingDir); createLink(shortcut, name, exe, profileArguments, icon, workingDir);
} }
} }