Fixes/tweaks

Author: animetosho

createprogress.cpp

@@ -306,6 +306,7 @@ void CreateProgress::on_CreateProgress_rejected()
         // TODO: look at using .terminate() for non-Windows
         parpar.kill();
         ended(tr("Cancelled"), false);
+        parpar.waitForFinished(1000); // try to avoid warning of destroying QProcess whilst still active
         deleteOutput();
     }
 }
@@ -341,7 +342,7 @@ void CreateProgress::on_btnBackground_clicked()
         }
     }
     if(!SetPriorityClass(hPP, isBackground ? IDLE_PRIORITY_CLASS : normPrio)) {
-        ui->btnBackground->setEnabled(!isBackground);
+        ui->btnBackground->setChecked(!isBackground);
     }
     CloseHandle(hPP);
 #elif defined(Q_OS_UNIX)
@@ -365,7 +366,9 @@ void CreateProgress::on_btnBackground_clicked()
     }
 
     if(setpriority(PRIO_PROCESS, parpar.processId(), isBackground ? 19 : normPrio)) {
-        ui->btnBackground->setEnabled(!isBackground);
+        ui->btnBackground->setChecked(!isBackground);
+        // TODO: it seems like you can't increase priority back to normal on Linux
+        // TODO: if failed, the settings change is still persisted
     }
 #endif
 

mainwindow.cpp

@@ -124,7 +124,7 @@ void MainWindow::adjustExpansion(bool allowExpand) {
     ui->fraDestOpts->layout()->setContentsMargins(destOptsMargin);
 
     auto destPolicy = ui->grpDest->sizePolicy();
-    destPolicy.setVerticalPolicy(outExp ? QSizePolicy::Preferred : QSizePolicy::Maximum);
+    destPolicy.setVerticalPolicy(outExp ? QSizePolicy::Expanding : QSizePolicy::Maximum);
     ui->grpDest->setSizePolicy(destPolicy);
     ui->grpDest->adjustSize();
 

settings.cpp

@@ -16,7 +16,7 @@ QStringList Settings::parparBin(bool* isSystemExecutable) const
         if(!pathNode.isEmpty()) {
             if(pathNode != "node") // system executable - can't make absolute
                 pathNode = pathConverter(pathNode);
-            return {pathConverter(pathNode), pathConverter(pathParPar)};
+            return {pathNode, pathConverter(pathParPar)};
         } else {
             if(pathParPar != "parpar")
                 pathParPar = pathConverter(pathParPar);
@@ -70,17 +70,18 @@ static QString relPathConverter(const QString& file)
     QDir cd;
     QFileInfo info(file);
     if(info.isAbsolute()) {
-        QString relPath = cd.relativeFilePath(file).replace("/", QDir::separator());
+        QString relPath = cd.relativeFilePath(file);
 #ifdef Q_OS_WINDOWS
         // on Windows, can't use relative paths if on different drives (or drive <> UNC path)
         if(cd.absolutePath().left(2).compare(file.left(2), Qt::CaseInsensitive) == 0)
 #else
         // on *nix, path in current dir should have preceeding './'
         // (we don't really require it, because we're not executing over a shell, but it distinguishes a local binary vs system binary)
-        if(!relPath.contains(QDir::separator()))
+        if(!relPath.contains("/"))
             return QString(".") + QDir::separator() + relPath;
 #endif
-        return relPath;
+        if(!relPath.startsWith("../")) // only allow relative paths if in the same folder
+            return relPath.replace("/", QDir::separator());
     }
     return file;
 }