arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-07-07 02:55:47 +00:00
Code Issues Projects Releases Wiki Activity

release 1.4.2

Browse Source 
* fix work with helper from GUI
This commit is contained in:
arcan1s
2015-03-21 00:00:47 +03:00
parent 824a11457b
commit ff3e000688
7 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sources/gui/src/mainwindow.cpp
View File

@ -106,7 +106,7 @@ MainWindow::~MainWindow()
{
if (debug) qDebug() << PDEBUG;
if ((useHelper) && (configuration[QString("CLOSE_HELPER")] == QString("true")))
if (configuration[QString("CLOSE_HELPER")] == QString("true"))
forceStopHelper();
deleteObjects();
delete ui;
@ -383,13 +383,8 @@ void MainWindow::updateConfiguration(const QMap<QString, QVariant> args)
QMap<QString, QString> optionsDict = parseOptions(args[QString("options")].toString());
for (int i=0; i<optionsDict.keys().count(); i++)
configuration[optionsDict.keys()[i]] = optionsDict[optionsDict.keys()[i]];
if ((configuration[QString("USE_HELPER")] == QString("true")) &&
(checkExternalApps(QString("helper"), configuration, debug)))
useHelper = true;
else {
useHelper = false;
configuration[QString("USE_HELPER")] = QString("false");
}
useHelper = ((configuration[QString("USE_HELPER")] == QString("true")) &&
(checkExternalApps(QString("helper"), configuration, debug)));
// update translation
qApp->removeTranslator(translator);
@ -462,9 +457,8 @@ bool MainWindow::checkHelperStatus()
if (debug) qDebug() << PDEBUG;
if (useHelper) useHelper = isHelperActive();
if (useHelper)
sendRequestToCtrl(QString("Update"), debug);
else {
if (!useHelper) {
configuration[QString("CLOSE_HELPER")] = QString("false");
configuration[QString("FORCE_SUDO")] = QString("true");
configuration[QString("USE_HELPER")] = QString("false");
}