+ crash during download fixed

+ providing data in uploading
chrxh · Oct 15, 2024 · 7aa3655 · 7aa3655
1 parent f2291e1
commit 7aa3655
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/source/Gui/NetworkTransferController.cpp b/source/Gui/NetworkTransferController.cpp
@@ -44,7 +44,7 @@ void NetworkTransferController::onDownload(DownloadNetworkResourceRequestData co
                 auto const& deserializedSimulation = std::get<DeserializedSimulation>(data.resourceData);
                 try {
                     _simController->newSimulation(
-                        requestData.resourceName,
+                        data.resourceName,
                         deserializedSimulation.auxiliaryData.timestep,
                         deserializedSimulation.auxiliaryData.generalSettings,
                         deserializedSimulation.auxiliaryData.simulationParameters);
@@ -60,7 +60,7 @@ void NetworkTransferController::onDownload(DownloadNetworkResourceRequestData co
                     showMessage("Error", *errorMessage);
                     _simController->closeSimulation();
                     _simController->newSimulation(
-                        requestData.resourceName,
+                        data.resourceName,
                         deserializedSimulation.auxiliaryData.timestep,
                         deserializedSimulation.auxiliaryData.generalSettings,
                         deserializedSimulation.auxiliaryData.simulationParameters);

diff --git a/source/Gui/UploadSimulationDialog.cpp b/source/Gui/UploadSimulationDialog.cpp
@@ -144,11 +144,19 @@ void _UploadSimulationDialog::onUpload()
 {
     printOverlayMessage("Uploading ...");
 
+    auto data = [&]() -> std::variant<UploadNetworkResourceRequestData::SimulationData, UploadNetworkResourceRequestData::GenomeData> {
+        if (_resourceType == NetworkResourceType_Simulation) {
+            return UploadNetworkResourceRequestData::SimulationData{.zoom = Viewport::getZoomFactor(), .center = Viewport::getCenterInWorldPos()};
+        } else {
+            return UploadNetworkResourceRequestData::GenomeData{.description = _genomeEditorWindow->getCurrentGenome()};
+        }
+    }();
     auto workspaceType = _share ? WorkspaceType_Public : WorkspaceType_Private;
     NetworkTransferController::get().onUpload(UploadNetworkResourceRequestData{
         .folderName = _folder,
         .resourceWithoutFolderName = _resourceName,
         .resourceDescription = _resourceDescription,
         .workspaceType = workspaceType,
-        .downloadCache = _browserWindow->getSimulationCache()});
+        .downloadCache = _browserWindow->getSimulationCache(),
+        .data = data});
 }