Merge branch 'Alexays:master' into hyprland/windowcount

src/modules/hyprland/backend.cpp

@@ -18,6 +18,9 @@ namespace waybar::modules::hyprland {
 std::filesystem::path IPC::socketFolder_;
 
 std::filesystem::path IPC::getSocketFolder(const char* instanceSig) {
+  static std::mutex folderMutex;
+  std::unique_lock lock(folderMutex);
+
   // socket path, specified by EventManager of Hyprland
   if (!socketFolder_.empty()) {
     return socketFolder_;

src/modules/hyprland/window.cpp

@@ -191,12 +191,6 @@ void Window::queryActiveWorkspace() {
         solo_ = true;
       }
 
-      // Grouped windows have a tab bar and therefore don't look fullscreen or solo
-      if (windowData_.grouped) {
-        fullscreen_ = false;
-        solo_ = false;
-      }
-
       if (solo_) {
         soloClass_ = windowData_.class_name;
       } else {