Merge branch 'release-ios-3.2.0-android-4.0.0'

2016-03-30 17:01:54 -07:00
parent b6a181097c 7b5a1ca167
commit 5eda74a514
101 changed files with 2268 additions and 1077 deletions
--- a/platform/default/default_file_source.cpp
+++ b/platform/default/default_file_source.cpp
@@ -88,6 +88,7 @@ public:

    void deleteRegion(OfflineRegion&& region, std::function<void (std::exception_ptr)> callback) {
        try {
+            downloads.erase(region.getID());
            offlineDatabase.deleteRegion(std::move(region));
            callback({});
        } catch (...) {