Merge branch 'flameshot-org-master' into bugfix/memory-leak

# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	data/graphics.qrc
#	src/config/configwindow.cpp
#	src/tools/imgur/imguruploader.cpp
This commit is contained in:
Yuriy Puchkov
2020-10-11 20:49:15 +03:00
26 changed files with 153 additions and 71 deletions

View File

@@ -116,7 +116,8 @@ bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap& capture)
QString msg = QObject::tr("Error trying to save as ") + savePath;
QMessageBox saveErrBox(
QMessageBox::Warning, QObject::tr("Save Error"), msg);
saveErrBox.setWindowIcon(QIcon(":img/app/flameshot.svg"));
saveErrBox.setWindowIcon(
QIcon(":img/app/org.flameshot.Flameshot.svg"));
saveErrBox.exec();
}
}