Fixed|FS: Potential crash at disconnect from server

Double deletion of the remote files folder.
skyjake · Sep 15, 2019 · e43a5ce · e43a5ce
1 parent 5601715
commit e43a5ce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/doomsday/libs/core/src/filesys/remote/link.cpp b/doomsday/libs/core/src/filesys/remote/link.cpp
@@ -183,7 +183,7 @@ void Link::wasDisconnected()
     // Remove the local root folder.
     if (Folder *root = FS::tryLocate<Folder>(d->localRootPath))
     {
-        trash(root);
+        delete root; //trash(root);
     }
 }
 

diff --git a/doomsday/libs/core/src/net/packagedownloader.cpp b/doomsday/libs/core/src/net/packagedownloader.cpp
@@ -48,7 +48,7 @@ DE_PIMPL(PackageDownloader)
     AssetGroup                      downloads;
     Hash<IDownloadable *, Rangei64> downloadBytes;
     std::function<void()>           postDownloadCallback;
-    Dispatch                    deferred;
+    Dispatch                        deferred;
 
     Impl(Public *i) : Base(i) {}
 
@@ -302,7 +302,8 @@ void PackageDownloader::unmountServerRepository()
 
     if (Folder *remoteFiles = FS::tryLocate<Folder>(PATH_REMOTE_SERVER))
     {
-        trash(remoteFiles);
+//        trash(remoteFiles);
+        delete remoteFiles;
     }
 }