Fixed merge conflicts
This commit is contained in:
@@ -30,7 +30,14 @@ ScreenshotSaver::ScreenshotSaver() {}
|
||||
void
|
||||
ScreenshotSaver::saveToClipboard(const QPixmap& capture)
|
||||
{
|
||||
SystemNotification().sendMessage(QObject::tr("Capture saved to clipboard"));
|
||||
if (ConfigHandler().saveAfterCopyValue()) {
|
||||
if (!ConfigHandler().saveAfterCopyPathValue().isEmpty()) {
|
||||
saveToFilesystem(capture, ConfigHandler().saveAfterCopyPathValue());
|
||||
}
|
||||
} else {
|
||||
SystemNotification().sendMessage(QObject::tr("Capture saved to clipboard"));
|
||||
}
|
||||
|
||||
QApplication::clipboard()->setPixmap(capture);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user