feat: improved installer error handling

zziger · Aug 18, 2024 · f9e1bae · f9e1bae
1 parent e2de8b9
commit f9e1bae
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/supermod/modloader/install/ModInstaller.hpp b/src/supermod/modloader/install/ModInstaller.hpp
@@ -131,16 +131,26 @@ class ModInstaller
         installing = true;
         installingCurrentRequest = 0;
 
-        UpdateCandidates();
         try
         {
+            UpdateCandidates();
             for (int i = 0; i < candidateRequests.size(); i++)
             {
                 installingCurrentRequest = i;
                 auto source = candidateRequests[i]->GetActiveSource();
                 if (source == nullptr)
                     continue;
-                co_await source->Install();
+                try
+                {
+                    co_await source->Install();
+                }
+                catch (std::exception& e)
+                {
+                    installing = false;
+                    ui::NotificationManager::Notify("Ошибка при установке мода " +
+                                                    candidateRequests[i]->GetModInfo()->title + ": " +
+                                                    std::string(e.what()));
+                }
             }
         }
         catch (std::exception& e)

diff --git a/src/supermod/ui/windows/installerWindow.cpp b/src/supermod/ui/windows/installerWindow.cpp
@@ -28,7 +28,7 @@ void sm::ui::windows::Installer()
     if (modloader::ModInstaller::IsInstalling())
     {
 
-        ImGui::SetNextWindowSize(ImVec2{600, 0}, ImGuiCond_Appearing);
+        ImGui::SetNextWindowSize(ImVec2{600, 0}, ImGuiCond_Always);
         if (ImGui::Begin("Установка модов", nullptr,
                          ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize))
         {