benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not interpret empty --path as current dir (#1838)

Browse Source 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
This commit is contained in:
Haris Gušić
2021-08-24 17:27:44 +02:00
committed by GitHub
parent 41ca51bc10
commit 22c9ea1f47
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main.cpp
View File

@@ -293,7 +293,10 @@ int main(int argc, char* argv[])
}
sessionBus.call(m);
} else if (parser.isSet(guiArgument)) { // GUI
QString pathValue = QDir(parser.value(pathOption)).absolutePath();
QString pathValue = parser.value(pathOption);
if (!pathValue.isEmpty()) {
pathValue = QDir(pathValue).absolutePath();
}
int delay = parser.value(delayOption).toInt();
bool toClipboard = parser.isSet(clipboardOption);
bool isRaw = parser.isSet(rawImageOption);
@@ -324,7 +327,10 @@ int main(int argc, char* argv[])
return waitAfterConnecting(delay, app);
}
} else if (parser.isSet(fullArgument)) { // FULL
QString pathValue = QDir(parser.value(pathOption)).absolutePath();
QString pathValue = parser.value(pathOption);
if (!pathValue.isEmpty()) {
pathValue = QDir(pathValue).absolutePath();
}
int delay = parser.value(delayOption).toInt();
bool toClipboard = parser.isSet(clipboardOption);
bool isRaw = parser.isSet(rawImageOption);
@@ -379,7 +385,10 @@ int main(int argc, char* argv[])
QString numberStr = parser.value(screenNumberOption);
int number =
numberStr.startsWith(QLatin1String("-")) ? -1 : numberStr.toInt();
QString pathValue = QDir(parser.value(pathOption)).absolutePath();
QString pathValue = parser.value(pathOption);
if (!pathValue.isEmpty()) {
pathValue = QDir(pathValue).absolutePath();
}
int delay = parser.value(delayOption).toInt();
bool toClipboard = parser.isSet(clipboardOption);
bool isRaw = parser.isSet(rawImageOption);