aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaturn&Eric <[email protected]>2024-02-01 14:47:36 +0000
committerGitHub <[email protected]>2024-02-01 14:47:36 +0000
commitf00c1725a247ea12760396ae5184ab17c7681f62 (patch)
treebcf95b660c81baff87e021f5d2a28a53c7832a2d
parentMerge pull request #130 from saturneric/dev/2.1.1/main (diff)
parentfix: cannot properly find and verify some special-name original files (diff)
downloadGpgFrontend-f00c1725a247ea12760396ae5184ab17c7681f62.tar.gz
GpgFrontend-f00c1725a247ea12760396ae5184ab17c7681f62.zip
Merge pull request #131 from saturneric/dev/2.1.1/mainv2.1.2
Develop 2.1.2.6
-rw-r--r--src/ui/main_window/MainWindowFileSlotFunction.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ui/main_window/MainWindowFileSlotFunction.cpp b/src/ui/main_window/MainWindowFileSlotFunction.cpp
index 6f550c09..bc3accfa 100644
--- a/src/ui/main_window/MainWindowFileSlotFunction.cpp
+++ b/src/ui/main_window/MainWindowFileSlotFunction.cpp
@@ -465,7 +465,7 @@ void MainWindow::SlotFileVerify(const QString& path) {
if (prossible_singleton_target) {
swap(data_file_path, sign_file_path);
} else {
- data_file_path = file_info.path() + "/" + file_info.baseName();
+ data_file_path = file_info.path() + "/" + file_info.completeBaseName();
}
auto data_file_info = QFileInfo(data_file_path);
@@ -480,7 +480,8 @@ void MainWindow::SlotFileVerify(const QString& path) {
if (!ok) return;
- data_file_path = text.isEmpty() ? path : text;
+ data_file_path = text.isEmpty() ? data_file_path : text;
+ data_file_info = QFileInfo(data_file_path);
}
if (!data_file_info.isFile() ||