From 9baadf63e95043a315d0440630b01b3205d2be60 Mon Sep 17 00:00:00 2001 From: ArsenArsen Date: Sun, 16 Jul 2017 18:48:21 +0200 Subject: [PATCH] Fix #18 --- uploaders/uploadersingleton.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/uploaders/uploadersingleton.cpp b/uploaders/uploadersingleton.cpp index 8198b06..3f21481 100644 --- a/uploaders/uploadersingleton.cpp +++ b/uploaders/uploadersingleton.cpp @@ -95,7 +95,9 @@ void UploaderSingleton::upload(QPixmap pixmap) { void UploaderSingleton::upload(QByteArray img, QString format) { if (img.isEmpty()) return; - QFile file(saveDir.absoluteFilePath(formatter::format(settings::settings().value("fileFormat").toString(), format.toLower()))); + QFile file(saveDir.absoluteFilePath( + formatter::format(settings::settings().value("fileFormat", "Screenshot %(yyyy-MM-dd HH-mm-ss)date.%ext").toString(), + format.toLower()))); if (file.open(QFile::WriteOnly)) { file.write(img); file.close(); @@ -105,8 +107,9 @@ void UploaderSingleton::upload(QByteArray img, QString format) { void UploaderSingleton::upload(QFile &img, QString format) { if (img.size() <= 0) return; - if (img.rename( - saveDir.absoluteFilePath(formatter::format(settings::settings().value("fileFormat").toString(), format.toLower())))) { + if (img.rename(saveDir.absoluteFilePath( + formatter::format(settings::settings().value("fileFormat", "Screenshot %(yyyy-MM-dd HH-mm-ss)date.%ext").toString(), + format.toLower())))) { if (img.open(QFile::ReadWrite)) uploaders.value(uploader)->doUpload(img.readAll(), format); else