Changed: Minor changes
This commit is contained in:
parent
b6b6540b38
commit
fe7bfe397e
3 changed files with 10 additions and 16 deletions
|
@ -245,7 +245,8 @@ void CMainWindow::onUninstall()
|
||||||
components = dialog.getSelectedCompenents();
|
components = dialog.getSelectedCompenents();
|
||||||
}
|
}
|
||||||
|
|
||||||
COperationDialog dialog;
|
{
|
||||||
|
COperationDialog dialog(this);
|
||||||
|
|
||||||
dialog.setOperation(OperationUninstall);
|
dialog.setOperation(OperationUninstall);
|
||||||
dialog.setUninstallComponents(components);
|
dialog.setUninstallComponents(components);
|
||||||
|
@ -253,6 +254,7 @@ void CMainWindow::onUninstall()
|
||||||
if (dialog.exec())
|
if (dialog.exec())
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CMainWindow::onQuit()
|
void CMainWindow::onQuit()
|
||||||
|
|
|
@ -771,15 +771,10 @@ void COperationDialog::copyInstaller()
|
||||||
// create menu directory if defined
|
// create menu directory if defined
|
||||||
QString path = config->getMenuDirectory();
|
QString path = config->getMenuDirectory();
|
||||||
|
|
||||||
if (!path.isEmpty())
|
if (!path.isEmpty() && !QDir().mkpath(path))
|
||||||
{
|
|
||||||
QDir dir;
|
|
||||||
|
|
||||||
if (!dir.mkpath(path))
|
|
||||||
{
|
{
|
||||||
qDebug() << "Unable to create directory" << path;
|
qDebug() << "Unable to create directory" << path;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// create installer link in menu
|
// create installer link in menu
|
||||||
QString executable = newInstallerFullPath;
|
QString executable = newInstallerFullPath;
|
||||||
|
|
|
@ -229,9 +229,6 @@ bool resolveShortcut(const QWidget &window, const QString &shortcut, QString &pa
|
||||||
// Handle success
|
// Handle success
|
||||||
path = QDir::fromNativeSeparators(qFromWide(szGotPath));
|
path = QDir::fromNativeSeparators(qFromWide(szGotPath));
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue