From de2580e9469414bc855432f4999dfaaf55bddf47 Mon Sep 17 00:00:00 2001 From: lupoDharkael Date: Mon, 13 Nov 2017 16:21:46 +0100 Subject: [PATCH] Redefinition of fullscreen commands --- src/core/flameshotdbusadapter.cpp | 5 ----- src/main.cpp | 13 +++++++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/core/flameshotdbusadapter.cpp b/src/core/flameshotdbusadapter.cpp index 60498d78..cc726cf0 100644 --- a/src/core/flameshotdbusadapter.cpp +++ b/src/core/flameshotdbusadapter.cpp @@ -75,17 +75,12 @@ void FlameshotDBusAdapter::fullScreen( Q_EMIT captureFailed(id); return; } - if (!toClipboard && path.isEmpty()) { - ResourceExporter().captureToFileUi(p); - goto emit_signal; - } if(toClipboard) { ResourceExporter().captureToClipboard(p); } if(!path.isEmpty()) { ResourceExporter().captureToFile(p, path); } - emit_signal: QByteArray byteArray; QBuffer buffer(&byteArray); p.save(&buffer, "PNG"); diff --git a/src/main.cpp b/src/main.cpp index 35220699..22ae776a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -165,8 +165,9 @@ int main(int argc, char *argv[]) { parser.AddOptions({ filenameOption, trayOption, showHelpOption, mainColorOption, contrastColorOption }, configArgument); // Parse - if (!parser.parse(app.arguments())) - return 0; + if (!parser.parse(app.arguments())) { + goto finish; + } // PROCESS DATA //-------------- @@ -212,6 +213,13 @@ int main(int argc, char *argv[]) { int delay = parser.value(delayOption).toInt(); bool toClipboard = parser.isSet(clipboardOption); bool isRaw = parser.isSet(rawImageOption); + // Not a valid command + if (!isRaw && !toClipboard && pathValue.isEmpty()) { + QTextStream(stdout) << "you have to set a valid flag:\n\n"; + parser.parse(QStringList() << argv[0] << "full" << "-h"); + goto finish; + } + uint id = qHash(app.arguments().join(" ")); DBusUtils utils(id); @@ -306,5 +314,6 @@ int main(int argc, char *argv[]) { sessionBus.call(m); } } +finish: return 0; }