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

On failed cloud save hide progress bar

Browse source 
The progressbar was not hidden on failed save to cloud. In return
remove an unnecessary variable on loading from cloud.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2017-12-01 18:20:43 +01:00 • committed by Dirk Hohndel
parent c38e0f225f
commit 136110784e
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
desktop-widgets/mainwindow.cpp
View file

@ -610,8 +610,7 @@ void MainWindow::on_actionCloudstorageopen_triggered()
showProgressBar(); showProgressBar();
QByteArray fileNamePtr = QFile::encodeName(filename); QByteArray fileNamePtr = QFile::encodeName(filename);
error = parse_file(fileNamePtr.data()); if (!parse_file(fileNamePtr.data())) {
if (!error) {
set_filename(fileNamePtr.data(), true); set_filename(fileNamePtr.data(), true);
setTitle(MWTF_FILENAME); setTitle(MWTF_FILENAME);
} }
@ -638,11 +637,10 @@ void MainWindow::on_actionCloudstoragesave_triggered()
information()->acceptChanges(); information()->acceptChanges();
showProgressBar(); showProgressBar();
int error = save_dives(filename.toUtf8().data());
if (save_dives(filename.toUtf8().data()))
return;
hideProgressBar(); hideProgressBar();
if (error)
return;
set_filename(filename.toUtf8().data(), true); set_filename(filename.toUtf8().data(), true);
setTitle(MWTF_FILENAME); setTitle(MWTF_FILENAME);