fix(core): SDK CHandle, Temporary Menu Crash, Workflows

swiftly-solution · Jul 22, 2024 · 5e3f3f0 · 5e3f3f0
1 parent cb3779a
commit 5e3f3f0
Show file tree

Hide file tree

Showing 5 changed files with 526 additions and 524 deletions.
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
@@ -130,9 +130,10 @@ jobs:
 
             - name: Prepare ZIP Files
               run: |
-                (cd build; zip -qq -r ../../Swiftly.Plugin.Linux.zip . -i build/Swiftly.Plugin.Linux/*)
-                (cd build; zip -qq -r ../../Swiftly.Plugin.Windows.zip . -i build/Swiftly.Plugin.Windows/*)
-                (cd build; zip -qq -r ../../Swiftly.Plugin.Depot.Linux.zip . -i build/Swiftly.Plugin.Depot.Linux/*)
+                sudo apt install p7zip-full -y;
+                (cd build/Swiftly.Plugin.Linux; 7z a -tzip ../../../Swiftly.Plugin.Linux.zip *)
+                (cd build/Swiftly.Plugin.Windows; 7z a -tzip ../../../Swiftly.Plugin.Windows.zip *)
+                (cd build/Swiftly.Plugin.Depot.Linux; 7z a -tzip ../../../Swiftly.Plugin.Depot.Linux.zip *)
                 echo "PATH_ARTIFACTS=$(cd ..; pwd)" >> $GITHUB_ENV
 
             - name: Release

diff --git a/src/menus/MenuManager.cpp b/src/menus/MenuManager.cpp
@@ -34,8 +34,9 @@ void MenuManager::UnregisterMenu(std::string id)
         if (!player->HasMenuShown())
             continue;
 
-        if (player->GetMenu()->GetID() == id)
-            player->HideMenu();
+        if(player->GetMenu())
+            if (player->GetMenu()->GetID() == id)
+                player->HideMenu();
     }
 
     Menu *menu = this->menu_ids.at(id);