diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml index a910789d..26c3f744 100644 --- a/.github/workflows/electron.yml +++ b/.github/workflows/electron.yml @@ -201,11 +201,15 @@ jobs: if [ -f "termix-${VERSION}-armv7l.tar.gz" ]; then mv "termix-${VERSION}-armv7l.tar.gz" "termix_linux_armv7l_portable.tar.gz" fi - # Rename Debian amd64 to x64 for consistency + if [ -f "termix_linux_amd64_deb.deb" ]; then mv "termix_linux_amd64_deb.deb" "termix_linux_x64_deb.deb" fi + if [ -f "termix_linux_x86_64_appimage.AppImage" ]; then + mv "termix_linux_x86_64_appimage.AppImage" "termix_linux_x64_appimage.AppImage" + fi + cd .. - name: List release files diff --git a/src/ui/desktop/authentication/Auth.tsx b/src/ui/desktop/authentication/Auth.tsx index f113cd6b..9976095f 100644 --- a/src/ui/desktop/authentication/Auth.tsx +++ b/src/ui/desktop/authentication/Auth.tsx @@ -59,6 +59,9 @@ export function Auth({ const { t } = useTranslation(); const isInElectronWebView = () => { + if ((window as any).IS_ELECTRON_WEBVIEW) { + return true; + } try { if (window.self !== window.top) { return true; @@ -140,12 +143,6 @@ export function Auth({ }, []); useEffect(() => { - if (isInElectronWebView()) { - setDbHealthChecking(false); - setDbConnectionFailed(false); - return; - } - setDbHealthChecking(true); getSetupRequired() .then((res) => { diff --git a/src/ui/desktop/authentication/ElectronLoginForm.tsx b/src/ui/desktop/authentication/ElectronLoginForm.tsx index ae6f7349..131c84ce 100644 --- a/src/ui/desktop/authentication/ElectronLoginForm.tsx +++ b/src/ui/desktop/authentication/ElectronLoginForm.tsx @@ -168,6 +168,7 @@ export function ElectronLoginForm({ const injectedScript = ` (function() { window.IS_ELECTRON = true; + window.IS_ELECTRON_WEBVIEW = true; if (typeof window.electronAPI === 'undefined') { window.electronAPI = { isElectron: true }; }