aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Vijay Aravamudhan <vraravam@users.noreply.github.com>2023-05-28 10:41:08 +0530
committerLibravatar GitHub <noreply@github.com>2023-05-28 05:11:08 +0000
commit8e3ee3190a11d61e16143e918984e75102195b03 (patch)
treef76e998ba1e2137c3d5153308ec6ebc5fa426567
parent6.3.0-nightly.12 [skip ci] (diff)
downloadferdium-app-8e3ee3190a11d61e16143e918984e75102195b03.tar.gz
ferdium-app-8e3ee3190a11d61e16143e918984e75102195b03.tar.zst
ferdium-app-8e3ee3190a11d61e16143e918984e75102195b03.zip
Disable in-app auto-updates for portable windows installation (fixes #1088) (#1200)
-rw-r--r--src/components/AppUpdateInfoBar.tsx5
-rw-r--r--src/components/settings/settings/EditSettingsForm.tsx4
2 files changed, 6 insertions, 3 deletions
diff --git a/src/components/AppUpdateInfoBar.tsx b/src/components/AppUpdateInfoBar.tsx
index ff4a9b9ad..b27578d10 100644
--- a/src/components/AppUpdateInfoBar.tsx
+++ b/src/components/AppUpdateInfoBar.tsx
@@ -6,6 +6,7 @@ import InfoBar from './ui/InfoBar';
6import Icon from './ui/icon'; 6import Icon from './ui/icon';
7 7
8import { onAuthGoToReleaseNotes } from '../helpers/update-helpers'; 8import { onAuthGoToReleaseNotes } from '../helpers/update-helpers';
9import { isWinPortable } from '../environment';
9 10
10const messages = defineMessages({ 11const messages = defineMessages({
11 updateAvailable: { 12 updateAvailable: {
@@ -36,7 +37,9 @@ const AppUpdateInfoBar = (props: IProps) => {
36 <InfoBar 37 <InfoBar
37 type="primary" 38 type="primary"
38 ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)} 39 ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)}
39 onClick={onInstallUpdate} 40 onClick={event => {
41 !isWinPortable && onInstallUpdate(event);
42 }}
40 onHide={onHide} 43 onHide={onHide}
41 > 44 >
42 <Icon icon={mdiInformation} /> 45 <Icon icon={mdiInformation} />
diff --git a/src/components/settings/settings/EditSettingsForm.tsx b/src/components/settings/settings/EditSettingsForm.tsx
index 39c25f529..6ece340ba 100644
--- a/src/components/settings/settings/EditSettingsForm.tsx
+++ b/src/components/settings/settings/EditSettingsForm.tsx
@@ -28,7 +28,7 @@ import {
28 SPLIT_COLUMNS_MAX, 28 SPLIT_COLUMNS_MAX,
29 SPLIT_COLUMNS_MIN, 29 SPLIT_COLUMNS_MIN,
30} from '../../../config'; 30} from '../../../config';
31import { isMac, isWindows, lockFerdiumShortcutKey } from '../../../environment'; 31import { isMac, isWinPortable, isWindows, lockFerdiumShortcutKey } from '../../../environment';
32import { openExternalUrl, openPath } from '../../../helpers/url-helpers'; 32import { openExternalUrl, openPath } from '../../../helpers/url-helpers';
33import globalMessages from '../../../i18n/globalMessages'; 33import globalMessages from '../../../i18n/globalMessages';
34import Icon from '../../ui/icon'; 34import Icon from '../../ui/icon';
@@ -1040,7 +1040,7 @@ class EditSettingsForm extends Component<IProps, IState> {
1040 </H2> 1040 </H2>
1041 1041
1042 <Toggle {...form.$('automaticUpdates').bind()} /> 1042 <Toggle {...form.$('automaticUpdates').bind()} />
1043 {automaticUpdates && ( 1043 {automaticUpdates && !isWinPortable && (
1044 <> 1044 <>
1045 <> 1045 <>
1046 <div> 1046 <div>