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

Fixed: Conflicts with member variables, see #279

Browse source
This commit is contained in:
kervala 2016-09-21 09:54:31 +02:00
parent 68f87ec209
commit 518babaae5
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);
QString executable = getClientFullPath();
QString exe = getClientFullPath();
QString workingDir = s.getDirectory();
QString arguments = QString("--profile %1").arg(id);
QString profileArguments = QString("--profile %1").arg(id);
// append custom arguments
if (!arguments.isEmpty()) arguments += QString(" %1").arg(arguments);
if (!arguments.isEmpty()) profileArguments += QString(" %1").arg(arguments);
QString icon;
#ifdef Q_OS_WIN32
// under Windows, icon is included in executable
icon = executable;
icon = exe;
#else
// icon is in the same directory as client
icon = s.getDirectory() + "/ryzom_client.png";
@ -88,7 +88,7 @@ void CProfile::createShortcuts() const
QString shortcut = getClientDesktopShortcutFullPath();
// create desktop shortcut
createLink(shortcut, name, executable, arguments, icon, workingDir);
createLink(shortcut, name, exe, profileArguments, icon, workingDir);
}
if (menuShortcut)
@ -96,7 +96,7 @@ void CProfile::createShortcuts() const
QString shortcut = getClientMenuShortcutFullPath();
// create menu shortcut
createLink(shortcut, name, executable, arguments, icon, workingDir);
createLink(shortcut, name, exe, profileArguments, icon, workingDir);
}
}