diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 73e731c..44808f6 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1464,7 +1464,7 @@ void MainWindow::verifyJohnVersion() } else { bool isJumbo = output.contains("jumbo", Qt::CaseInsensitive); QRegExp exp("John the Ripper .+ version (\\S+)[\n| ]", Qt::CaseInsensitive); - int pos = exp.indexIn(lines[0]); + int pos = exp.indexIn(output); if (pos > -1) { m_ui->labelJohnPathValidator->setText(tr("Detected John the Ripper ") + exp.cap(1) + (isJumbo ? "" : " (core)")); } else if (lines.size() > 0){ diff --git a/src/openotherformatfiledialog.cpp b/src/openotherformatfiledialog.cpp index 7cb26b6..3d1d03e 100644 --- a/src/openotherformatfiledialog.cpp +++ b/src/openotherformatfiledialog.cpp @@ -326,6 +326,10 @@ void OpenOtherFormatFileDialog::convertFile() parameters << runDir + "/" + scriptFullName; } else { program = runDir + "/" + scriptFullName; +#ifdef Q_OS_WIN + if (currentScript.extension.isEmpty()) + program += ".exe"; +#endif } // Add the arguments for (int i = 0; i < currentScript.parameters.size(); i++) {