Fix creating two primary instances

ShadowBlip · Feb 9, 2024 · ceb7c28 · ceb7c28
1 parent e242322
commit ceb7c28
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/src/gamescope/manager.rs b/src/gamescope/manager.rs
@@ -205,32 +205,23 @@ impl Manager {
                     path.clone(),
                     self.dbus.clone(),
                 )?;
-                let changes_rx = primary.listen_for_property_changes()?;
+                let property_changes_rx = primary.listen_for_property_changes()?;
+                let window_created_rx = primary.listen_for_window_created()?;
                 self.dbus.object_server().at(path.clone(), primary).await?;
 
                 // Propagate gamescope changes to DBus signals
                 xwayland::dispatch_primary_property_changes(
                     self.dbus.clone(),
                     path.clone(),
-                    changes_rx,
+                    property_changes_rx,
                 )
                 .await?;
 
-                // Window created events
-                let primary = xwayland::DBusInterfacePrimary::new(
-                    name.clone(),
-                    path.clone(),
-                    self.dbus.clone(),
-                )?;
-
-                let changes_rx = primary.listen_for_window_created()?;
-                self.dbus.object_server().at(path.clone(), primary).await?;
-
                 // Propagate gamescope changes to DBus signals
                 xwayland::dispatch_primary_window_created(
                     self.dbus.clone(),
                     path.clone(),
-                    changes_rx,
+                    window_created_rx,
                 )
                 .await?;
             }