From 8d34737ac0693bb448f016f195d5082dc8e6d3df Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Feb 2015 16:34:42 -0400 Subject: webapp: Fix reversion in opening webapp when starting it manually inside a repository. --- Command/WebApp.hs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Command') diff --git a/Command/WebApp.hs b/Command/WebApp.hs index 1c7bcfaa7..46ba556a3 100644 --- a/Command/WebApp.hs +++ b/Command/WebApp.hs @@ -195,10 +195,15 @@ recordUrl _ = noop #endif openBrowser :: Maybe FilePath -> FilePath -> String -> Maybe Handle -> Maybe Handle -> IO () +openBrowser mcmd htmlshim realurl outh errh = do + htmlshim' <- absPath htmlshim + openBrowser' mcmd htmlshim' realurl outh errh + +openBrowser' :: Maybe FilePath -> FilePath -> String -> Maybe Handle -> Maybe Handle -> IO () #ifndef __ANDROID__ -openBrowser mcmd htmlshim _realurl outh errh = runbrowser +openBrowser' mcmd htmlshim _realurl outh errh = runbrowser #else -openBrowser mcmd htmlshim realurl outh errh = do +openBrowser' mcmd htmlshim realurl outh errh = do recordUrl url {- Android's `am` command does not work reliably across the - wide range of Android devices. Intead, FIFO should be set to -- cgit v1.2.3