Merge pull request #361 from Dliwk/save-state-before-joining-public-party

Save UI state before joining public party

CHANGELOG.md

@@ -11,7 +11,7 @@
 ### 1.6.6 (20394)
 - Beginning work on moving to new asset system.
 - Added Tamil language (Thanks Ryan!)
-- Added methods for changing camera attributes to the _ba module.
+- Added methods for changing camera attributes to the `_ba` module.
 
 ### 1.6.5 (20394)
 - Added co-op support to server builds (thanks Dliwk!)
@@ -22,8 +22,8 @@
 ### 1.6.4 (20382)
 - Some cleanups in the Favorites tab of the gather window.
 - Reorganized prefab target names; some targets such as `prefab-debug` are now `prefab-gui-debug` (more consistent with the existing `prefab-server-debug` targets).
-- Windows builds now go to build/windows instead of ballisticacore_windows/build.
-- Lots of project reorganization to allow things such as documentation or the dummy _ba.py module to be rebuilt from the public repo.
+- Windows builds now go to build/windows instead of `ballisticacore_windows/build`.
+- Lots of project reorganization to allow things such as documentation or the dummy `_ba.py` module to be rebuilt from the public repo.
 - Added network flood attack mitigation.
 
 ### 1.6.3 (20366)

assets/src/ba_data/python/bastd/ui/gather/publictab.py

@@ -1209,6 +1209,7 @@ class PublicGatherTab(GatherTab):
 
     def on_public_party_activate(self, party: PartyEntry) -> None:
         """Called when a party is clicked or otherwise activated."""
+        self.save_state()
         if party.queue is not None:
             from bastd.ui.partyqueue import PartyQueueWindow
             ba.playsound(ba.getsound('swish'))

ballisticacore-cmake/CMakeLists.txt

@@ -45,7 +45,7 @@ if (HEADLESS)
       set(SDL2_LIBRARIES "SDL2::SDL2")
     endif ()
     # Getting complaint about space at the end of this on ubuntu16.
-    string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES)
+    string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
   else ()
     message(FATAL_ERROR "SDL2 not found")
   endif ()