etlegacy
/
Update-Installer
mirror of https://github.com/etlegacy/Update-Installer.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

setting executable overwrites the script values

This commit is contained in:
jackeri 2014-12-12 14:43:57 +02:00
parent 89bb4b2edc
commit 40c35f93cf
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/UpdateInstaller.cpp
View File

@ -412,20 +412,22 @@ void UpdateInstaller::restartMainApp()
std::string command;
std::list<std::string> args;
for (std::vector<UpdateScriptFile>::const_iterator iter = m_script->filesToInstall().begin();
iter != m_script->filesToInstall().end();
iter++)
{
if (iter->isMainBinary)
{
command = m_installDir + '/' + iter->path;
}
}
if (command.empty() && !m_executable.empty())
if (!m_executable.empty())
{
command = m_installDir + '/' + m_executable;
}
else
{
for (std::vector<UpdateScriptFile>::const_iterator iter = m_script->filesToInstall().begin();
iter != m_script->filesToInstall().end();
iter++)
{
if (iter->isMainBinary)
{
command = m_installDir + '/' + iter->path;
}
}
}
if (!command.empty())
{