mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: corrected timeout and error text problem in uploadDiveLogsDE

Browse source 
incorrectly stopped timer before the upload was started.

Signed-off-by: Jan Iversen <jan@casacondor.com>
This commit is contained in:
jan Iversen 2019-12-10 09:39:45 +01:00 • committed by Dirk Hohndel
parent 6ccea3c39d
commit cb252f39d7
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/uploadDiveLogsDE.cpp
View file

@ -37,10 +37,12 @@ void uploadDiveLogsDE::doUpload(bool selected, const QString &userid, const QStr
{ {
QString err; QString err;
/* generate a temporary filename and create/open that file with zip_open */ /* generate a temporary filename and create/open that file with zip_open */
QString filename(QDir::tempPath() + "/divelogsde-upload.dld"); QString filename(QDir::tempPath() + "/divelogsde-upload.dld");
// delete file if it exist // delete file if it exist
QFile f(filename); QFile f(filename);
if (f.open(QIODevice::ReadOnly)) { if (f.open(QIODevice::ReadOnly)) {
f.close(); f.close();
@ -49,15 +51,13 @@ void uploadDiveLogsDE::doUpload(bool selected, const QString &userid, const QStr
// Make zip file, with all dives, in divelogs.de format // Make zip file, with all dives, in divelogs.de format
if (!prepareDives(filename, selected)) { if (!prepareDives(filename, selected)) {
report_error(tr("Failed to create upload file %s\n").toUtf8(), qPrintable(filename)); emit uploadFinish(false, tr("Cannot prepare dives, none selected?"));
emit uploadFinish(false, err);
timeout.stop(); timeout.stop();
return; return;
} }
// And upload it // And upload it
uploadDives(filename, userid, password); uploadDives(filename, userid, password);
timeout.stop();
} }