fix(niri): keep the initial IPC connect synchronous

#5158 (6672e924) moved connectToSocket() off the constructing thread and
into the detached IPC worker's own try/catch, so a missing NIRI_SOCKET no
longer throws out of IPC::IPC(). That was needed to fix #5117 (the worker
should reconnect instead of dying when an established stream drops), but
it also meant the very first connection attempt can never fail anymore.

Factory::makeModule()/Bar::getModules() rely on that constructor throwing
to disable a module it can't construct. With niri/workspaces and
niri/window always constructing successfully now, they get added to every
bar regardless of which compositor is actually running, showing up as a
permanently-empty widget next to the real workspace modules under
Hyprland/Sway.

Restore the old semantics for the first connection: connectToSocket() runs
synchronously in IPC::IPC() again, so a missing socket still throws and
the module gets disabled as before. Only a drop *after* that succeeds
falls into the retrying reconnect loop, preserving the #5117 fix.

This commit is contained in:

Austin Horstman

2026-07-05 00:29:27 -05:00

parent 2d9b95e9de

commit 64f70caa46

2 changed files with 26 additions and 12 deletions

									
										include/modules/niri/backend.hpp
									
		+1
		-1
	
												View File
												
				@@ -34,7 +34,7 @@ class IPC {

				  unsigned keyboardLayoutCurrent() const { return keyboardLayoutCurrent_; }

				 private:

				  void startIPC();

				  void startIPC(int initial_socketfd);

				  static int connectToSocket();

				  void parseIPC(const std::string&);