diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-05 15:30:32 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-05 15:30:32 (GMT) |
| commit | 7c0ba094b87a43ebaf819b8f38894163a9df8ae6 (patch) | |
| tree | 0e5951f1dd860c9d8c38b9a941eb3e12b4a5507b /src/save/ServerSaveActivity.cpp | |
| parent | 0fbe12772dfb28abb491ac0b5a51854de8a30b4e (diff) | |
| download | powder-7c0ba094b87a43ebaf819b8f38894163a9df8ae6.zip powder-7c0ba094b87a43ebaf819b8f38894163a9df8ae6.tar.gz | |
Ensure save is stored in memory for reload when using Save as current name, correct ServerSaveActivity to call SaveUploaded when doing an instant upload
Diffstat (limited to 'src/save/ServerSaveActivity.cpp')
| -rw-r--r-- | src/save/ServerSaveActivity.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/save/ServerSaveActivity.cpp b/src/save/ServerSaveActivity.cpp index f5caf77..d336ea1 100644 --- a/src/save/ServerSaveActivity.cpp +++ b/src/save/ServerSaveActivity.cpp @@ -33,7 +33,6 @@ public: } }; -//Currently, reading is done on another thread, we can't render outside the main thread due to some bullshit with OpenGL class SaveUploadTask: public Task { SaveInfo save; @@ -151,11 +150,19 @@ ServerSaveActivity::ServerSaveActivity(SaveInfo save, bool saveNow, ServerSaveAc void ServerSaveActivity::NotifyDone(Task * task) { - Exit(); if(!task->GetSuccess()) { + Exit(); new ErrorMessage("Error", Client::Ref().GetLastError()); } + else + { + if(callback) + { + callback->SaveUploaded(save); + } + Exit(); + } } void ServerSaveActivity::Save() |
