diff --git a/html/src/app.js b/html/src/app.js
index e5821a77..d0f50853 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -15729,6 +15729,9 @@ speechSynthesis.getVoices();
'VRCX_autoUpdateVRCX',
'Auto Download'
);
+ if ($app.data.autoUpdateVRCX === 'Auto Install') {
+ $app.data.autoUpdateVRCX = 'Auto Download';
+ }
$app.data.branch = await configRepository.getString(
'VRCX_branch',
'Stable'
@@ -25148,17 +25151,9 @@ speechSynthesis.getVoices();
return;
case -16:
if (this.downloadCurrent.ref.id === 'VRCXUpdate') {
- if (this.downloadCurrent.autoInstall) {
- var isUpgrade = true;
- workerTimers.setTimeout(
- () => this.restartVRCX(isUpgrade),
- 2000
- );
- } else {
- this.downloadDialog.visible = false;
- this.pendingVRCXInstall = this.downloadCurrent.ref.name;
- this.showVRCXUpdateDialog();
- }
+ this.downloadDialog.visible = false;
+ this.pendingVRCXInstall = this.downloadCurrent.ref.name;
+ this.showVRCXUpdateDialog();
}
this.downloadFileComplete('Success');
return;
@@ -26222,8 +26217,7 @@ speechSynthesis.getVoices();
updateHashUrl,
size,
name,
- type,
- autoInstall
+ type
) {
var ref = {
id: 'VRCXUpdate',
@@ -26234,8 +26228,7 @@ speechSynthesis.getVoices();
type,
updateSetupUrl,
updateHashUrl,
- size,
- autoInstall
+ size
});
this.downloadQueueTable.data = Array.from(this.downloadQueue.values());
if (!this.downloadInProgress) {
@@ -26274,15 +26267,7 @@ speechSynthesis.getVoices();
}
var name = release.name;
var type = 'Manual';
- var autoInstall = false;
- this.downloadVRCXUpdate(
- downloadUrl,
- hashUrl,
- size,
- name,
- type,
- autoInstall
- );
+ this.downloadVRCXUpdate(downloadUrl, hashUrl, size, name, type);
this.VRCXUpdateDialog.visible = false;
this.showDownloadDialog();
}
@@ -26425,24 +26410,12 @@ speechSynthesis.getVoices();
} else if (this.autoUpdateVRCX === 'Notify') {
// this.showVRCXUpdateDialog();
} else if (this.autoUpdateVRCX === 'Auto Download') {
- var autoInstall = false;
this.downloadVRCXUpdate(
downloadUrl,
hashUrl,
size,
name,
- type,
- autoInstall
- );
- } else if (this.autoUpdateVRCX === 'Auto Install') {
- var autoInstall = true;
- this.downloadVRCXUpdate(
- downloadUrl,
- hashUrl,
- size,
- name,
- type,
- autoInstall
+ type
);
}
}
diff --git a/html/src/localization/en/en.json b/html/src/localization/en/en.json
index 60d63856..94dadb32 100644
--- a/html/src/localization/en/en.json
+++ b/html/src/localization/en/en.json
@@ -211,7 +211,6 @@
"auto_update_off": "Off",
"auto_update_notify": "Notify",
"auto_update_download": "Auto Download",
- "auto_update_install": "Auto Install",
"change_log": "Change Log"
},
"application": {
diff --git a/html/src/localization/es/en.json b/html/src/localization/es/en.json
index 22b8d51c..5e1d0223 100644
--- a/html/src/localization/es/en.json
+++ b/html/src/localization/es/en.json
@@ -211,7 +211,6 @@
"auto_update_off": "Desactivado",
"auto_update_notify": "Notificar",
"auto_update_download": "Descarga automática",
- "auto_update_install": "Instalar automáticamente",
"change_log": "Registro de cambios"
},
"application": {
diff --git a/html/src/localization/fr/en.json b/html/src/localization/fr/en.json
index 4cb6fac8..390b1b3e 100644
--- a/html/src/localization/fr/en.json
+++ b/html/src/localization/fr/en.json
@@ -211,7 +211,6 @@
"auto_update_off": "Désactivé",
"auto_update_notify": "Me demander",
"auto_update_download": "Téléchargement automatique",
- "auto_update_install": "Installation automatique",
"change_log": "Journal des modifications"
},
"application": {
diff --git a/html/src/localization/hu/en.json b/html/src/localization/hu/en.json
index 9cad4b55..e2649b4d 100644
--- a/html/src/localization/hu/en.json
+++ b/html/src/localization/hu/en.json
@@ -211,7 +211,6 @@
"auto_update_off": "Kikapcsolva",
"auto_update_notify": "Értesítsen",
"auto_update_download": "Automatikus letöltés",
- "auto_update_install": "Automatikus telepítés",
"change_log": "Változásnapló"
},
"application": {
diff --git a/html/src/localization/ja/en.json b/html/src/localization/ja/en.json
index a5140f23..1a681855 100644
--- a/html/src/localization/ja/en.json
+++ b/html/src/localization/ja/en.json
@@ -211,7 +211,6 @@
"auto_update_off": "オフ",
"auto_update_notify": "通知のみ",
"auto_update_download": "自動ダウンロード",
- "auto_update_install": "自動インストール",
"change_log": "更新履歴"
},
"application": {
diff --git a/html/src/localization/ko/en.json b/html/src/localization/ko/en.json
index accd68c0..4ec952dc 100644
--- a/html/src/localization/ko/en.json
+++ b/html/src/localization/ko/en.json
@@ -211,7 +211,6 @@
"auto_update_off": "끄기",
"auto_update_notify": "알림",
"auto_update_download": "자동 다운로드",
- "auto_update_install": "자동 설치",
"change_log": "변경사항"
},
"application": {
diff --git a/html/src/localization/pl/en.json b/html/src/localization/pl/en.json
index d27df949..cbaf5ccf 100644
--- a/html/src/localization/pl/en.json
+++ b/html/src/localization/pl/en.json
@@ -211,7 +211,6 @@
"auto_update_off": "Wył.",
"auto_update_notify": "Powiadamiaj",
"auto_update_download": "Auto. pobieranie",
- "auto_update_install": "Auto. instalacja",
"change_log": "Lista zmian"
},
"application": {
diff --git a/html/src/localization/pt/en.json b/html/src/localization/pt/en.json
index 831280df..4453bb7d 100644
--- a/html/src/localization/pt/en.json
+++ b/html/src/localization/pt/en.json
@@ -211,7 +211,6 @@
"auto_update_off": "Desligado",
"auto_update_notify": "Notificar",
"auto_update_download": "Transferência Automática",
- "auto_update_install": "Instalar automaticamente",
"change_log": "Registro de Alterações"
},
"application": {
diff --git a/html/src/localization/ru/en.json b/html/src/localization/ru/en.json
index b8de59f8..77c2f83f 100644
--- a/html/src/localization/ru/en.json
+++ b/html/src/localization/ru/en.json
@@ -211,7 +211,6 @@
"auto_update_off": "Выкл",
"auto_update_notify": "Оповестить",
"auto_update_download": "Автозагрузка",
- "auto_update_install": "Автоустановка",
"change_log": "Список изменений"
},
"application": {
diff --git a/html/src/localization/vi/en.json b/html/src/localization/vi/en.json
index 9217c065..8f736a94 100644
--- a/html/src/localization/vi/en.json
+++ b/html/src/localization/vi/en.json
@@ -211,7 +211,6 @@
"auto_update_off": "Tắt",
"auto_update_notify": "Thông báo",
"auto_update_download": "Tự động tải về",
- "auto_update_install": "Tự động cài đặt",
"change_log": "Thông tin về thay đổi (log)"
},
"application": {
diff --git a/html/src/localization/zh-CN/en.json b/html/src/localization/zh-CN/en.json
index 99218880..a260f561 100644
--- a/html/src/localization/zh-CN/en.json
+++ b/html/src/localization/zh-CN/en.json
@@ -211,7 +211,6 @@
"auto_update_off": "关闭",
"auto_update_notify": "显示通知",
"auto_update_download": "自动下载",
- "auto_update_install": "自动安装",
"change_log": "更新日志"
},
"application": {
diff --git a/html/src/localization/zh-TW/en.json b/html/src/localization/zh-TW/en.json
index f8442628..1b48540b 100644
--- a/html/src/localization/zh-TW/en.json
+++ b/html/src/localization/zh-TW/en.json
@@ -211,7 +211,6 @@
"auto_update_off": "關閉",
"auto_update_notify": "通知",
"auto_update_download": "自動下載",
- "auto_update_install": "自動安裝",
"change_log": "更新日誌"
},
"application": {
diff --git a/html/src/mixins/tabs/settings.pug b/html/src/mixins/tabs/settings.pug
index e16f4d1a..7398cad0 100644
--- a/html/src/mixins/tabs/settings.pug
+++ b/html/src/mixins/tabs/settings.pug
@@ -77,7 +77,6 @@ mixin settingsTab()
{ label: "Off", translationKey: "view.settings.general.vrcx_updater.auto_update_off" },
{ label: "Notify", translationKey: "view.settings.general.vrcx_updater.auto_update_notify" },
{ label: "Auto Download", translationKey: "view.settings.general.vrcx_updater.auto_update_download" },
- { label: "Auto Install", translationKey: "view.settings.general.vrcx_updater.auto_update_install" },
], "saveAutoUpdateVRCX")
//- General | Application
+simpleSettingsCategory("view.settings.general.application.header")