diff --git a/src/QBar/ControlSocket.hs b/src/QBar/ControlSocket.hs index 67cd966f882b43de74a0213878664fa5409941a2..dab3e471e428bc3b015fc063d8fdddaa78cc0e5f 100644 --- a/src/QBar/ControlSocket.hs +++ b/src/QBar/ControlSocket.hs @@ -215,19 +215,15 @@ ipcSocketAddress MainOptions{socketLocation} = maybe defaultSocketPath (return . defaultSocketPath :: IO FilePath defaultSocketPath = do waylandSocketPath' <- waylandSocketPath - maybe (maybe headlessSocketPath return =<< i3SocketPath) return waylandSocketPath' + maybe fallbackSocketPath return waylandSocketPath' where waylandSocketPath :: IO (Maybe FilePath) waylandSocketPath = handleEnvError $ do xdgRuntimeDir <- getEnv "XDG_RUNTIME_DIR" waylandDisplay <- getEnv "WAYLAND_DISPLAY" return $ xdgRuntimeDir </> waylandDisplay <> "-qbar" - i3SocketPath :: IO (Maybe FilePath) - i3SocketPath = handleEnvError $ do - i3SocketPath' <- getEnv "I3_SOCKET_PATH" - return $ i3SocketPath' <> "-qbar" - headlessSocketPath :: IO FilePath - headlessSocketPath = do + fallbackSocketPath :: IO FilePath + fallbackSocketPath = do xdgRuntimeDir <- getEnv "XDG_RUNTIME_DIR" return $ xdgRuntimeDir </> "qbar" handleEnvError :: IO FilePath -> IO (Maybe FilePath)