Fixed merge conflicts

This commit is contained in:
Jeremy Borgman
2020-09-09 19:58:32 -05:00
5 changed files with 115 additions and 3 deletions

View File

@@ -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);
}