mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-10 09:19:01 +00:00
Fixed: Restart Installer at the end of installation/migration
This commit is contained in:
parent
f31622de3c
commit
de1b1e67fa
2 changed files with 37 additions and 27 deletions
|
@ -974,29 +974,7 @@ OperationStep CConfigFile::getInstallNextStep() const
|
||||||
}
|
}
|
||||||
|
|
||||||
// current installer more recent than installed one
|
// current installer more recent than installed one
|
||||||
switch (compareInstallersVersion())
|
if (compareInstallersVersion() == 1) return CopyInstaller;
|
||||||
{
|
|
||||||
// current installer more recent, copy it
|
|
||||||
case 1: return CopyInstaller;
|
|
||||||
|
|
||||||
// current installer older, launch the more recent installer
|
|
||||||
case -1: return LaunchInstalledInstaller;
|
|
||||||
|
|
||||||
// continue only if 0 and launched Installer is the installed one
|
|
||||||
default:
|
|
||||||
{
|
|
||||||
#ifdef Q_OS_WIN32
|
|
||||||
QString tempPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
|
|
||||||
|
|
||||||
// check if launched from TEMP directory
|
|
||||||
bool rightPath = getInstallerCurrentDirPath().startsWith(tempPath);
|
|
||||||
#else
|
|
||||||
bool rightPath = false;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (!rightPath && getInstallerCurrentFilePath() != getInstallerInstalledFilePath() && QFile::exists(getInstallerInstalledFilePath())) return LaunchInstalledInstaller;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// no default profile
|
// no default profile
|
||||||
if (profile.id.isEmpty())
|
if (profile.id.isEmpty())
|
||||||
|
@ -1039,6 +1017,31 @@ OperationStep CConfigFile::getInstallNextStep() const
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// current installer more recent than installed one
|
||||||
|
switch (compareInstallersVersion())
|
||||||
|
{
|
||||||
|
// current installer more recent, copy it
|
||||||
|
case 1: break;
|
||||||
|
|
||||||
|
// current installer older, launch the more recent installer
|
||||||
|
case -1: return LaunchInstalledInstaller;
|
||||||
|
|
||||||
|
// continue only if 0 and launched Installer is the installed one
|
||||||
|
default:
|
||||||
|
{
|
||||||
|
#ifdef Q_OS_WIN32
|
||||||
|
QString tempPath = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
|
||||||
|
|
||||||
|
// check if launched from TEMP directory
|
||||||
|
bool rightPath = getInstallerCurrentDirPath().startsWith(tempPath);
|
||||||
|
#else
|
||||||
|
bool rightPath = false;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (!rightPath && getInstallerCurrentFilePath() != getInstallerInstalledFilePath() && QFile::exists(getInstallerInstalledFilePath())) return LaunchInstalledInstaller;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return Done;
|
return Done;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -242,6 +242,8 @@ int main(int argc, char *argv[])
|
||||||
step = config.getInstallNextStep();
|
step = config.getInstallNextStep();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool restartInstaller = false;
|
||||||
|
|
||||||
if (step != Done)
|
if (step != Done)
|
||||||
{
|
{
|
||||||
COperationDialog dialog;
|
COperationDialog dialog;
|
||||||
|
@ -254,20 +256,25 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
if (step == LaunchInstalledInstaller)
|
if (step == LaunchInstalledInstaller)
|
||||||
{
|
{
|
||||||
#ifndef _DEBUG
|
|
||||||
// restart more recent installed Installer version
|
// restart more recent installed Installer version
|
||||||
if (QProcess::startDetached(config.getInstallerInstalledFilePath())) return 0;
|
restartInstaller = true;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else if (step == Done)
|
else if (step == Done)
|
||||||
{
|
{
|
||||||
#if defined(Q_OS_WIN) && !defined(_DEBUG)
|
#if defined(Q_OS_WIN) && !defined(_DEBUG)
|
||||||
// restart Installer, so it could be copied in TEMP and allowed to update itself
|
// restart Installer, so it could be copied in TEMP and allowed to update itself
|
||||||
if (QProcess::startDetached(config.getInstallerInstalledFilePath())) return 0;
|
restartInstaller = true;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (restartInstaller)
|
||||||
|
{
|
||||||
|
#ifndef _DEBUG
|
||||||
|
if (QProcess::startDetached(config.getInstallerInstalledFilePath())) return 0;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
CMainWindow mainWindow;
|
CMainWindow mainWindow;
|
||||||
mainWindow.show();
|
mainWindow.show();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue