fix: don't close "Plus" window when cancelling image search (fix #2903)

Bionus · Jan 28, 2023 · a6e1439 · a6e1439
1 parent 18d0759
commit a6e1439
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/gui/src/search-window.cpp b/src/gui/src/search-window.cpp
@@ -117,14 +117,18 @@ void SearchWindow::accept()
 
 void SearchWindow::on_buttonImage_clicked()
 {
-	QString path = QFileDialog::getOpenFileName(this, tr("Search an image"), m_profile->getSettings()->value("Save/path").toString(), QStringLiteral("Images (*.png *.gif *.jpg *.jpeg)"));
+	const QString path = QFileDialog::getOpenFileName(this, tr("Search an image"), m_profile->getSettings()->value("Save/path").toString(), QStringLiteral("Images (*.png *.gif *.jpg *.jpeg)"));
+	if (path.isEmpty()) {
+		return;
+	}
+
 	QFile f(path);
-	QString md5;
-	if (f.exists()) {
-		f.open(QFile::ReadOnly);
-		md5 = QCryptographicHash::hash(f.readAll(), QCryptographicHash::Md5).toHex();
+	if (!f.exists() || !f.open(QFile::ReadOnly)) {
+		return;
 	}
+	const QString md5 = QCryptographicHash::hash(f.readAll(), QCryptographicHash::Md5).toHex();
+	f.close();
 
-	emit accepted(generateSearch(!md5.isEmpty() ? "md5:" + md5 : QString()));
+	emit accepted(generateSearch("md5:" + md5));
 	QDialog::accept();
 }