Skip to content

Commit 73c15e1

Browse files
sledgehammer999sledgehammer999
authored
Revert "NSIS: Create a mutex to ensure only one installer is running" (#23540)
This reverts commit 530c7d1. The installer uses the `UAC` plugin which creates two instances of the installer when launched. One runs with admin privileges while the other with user privileges. Creating a mutex in the first instance stops the other one from continuing. PR #23540
1 parent a59238f commit 73c15e1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+14
-128
lines changed

‎dist/windows/installer-translations/afrikaans.nsh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_AFRIKAANS} "Uninstall qBittorr
3636
LangString inst_arch_mismatch_x64_on_arm64 ${LANG_AFRIKAANS} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
3737
;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
3838
LangString inst_arch_mismatch_arm64_on_x64 ${LANG_AFRIKAANS} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
39-
;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
40-
LangString inst_already_running ${LANG_AFRIKAANS} "Another instance of the installer is already running."
39+
4140

4241
;------------------------------------
4342
;Uninstaller strings

‎dist/windows/installer-translations/albanian.nsh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ LangString inst_uninstall_link_description ${LANG_ALBANIAN} "Uninstall qBittorre
3838
LangString inst_arch_mismatch_x64_on_arm64 ${LANG_ALBANIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
3939
;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
4040
LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ALBANIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
41-
;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
42-
LangString inst_already_running ${LANG_ALBANIAN} "Another instance of the installer is already running."
41+
4342

4443
;------------------------------------
4544
;Uninstaller strings

‎dist/windows/installer-translations/arabic.nsh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_ARABIC} "Uninstall qBittorrent
3636
LangString inst_arch_mismatch_x64_on_arm64 ${LANG_ARABIC} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
3737
;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
3838
LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ARABIC} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
39-
;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
40-
LangString inst_already_running ${LANG_ARABIC} "Another instance of the installer is already running."
39+
4140

4241
;------------------------------------
4342
;Uninstaller strings

‎dist/windows/installer-translations/basque.nsh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_BASQUE} "Uninstall qBittorrent
3636
LangString inst_arch_mismatch_x64_on_arm64 ${LANG_BASQUE} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
3737
;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
3838
LangString inst_arch_mismatch_arm64_on_x64 ${LANG_BASQUE} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
39-
;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
40-
LangString inst_already_running ${LANG_BASQUE} "Another instance of the installer is already running."
4139

4240
;------------------------------------
4341
;Uninstaller strings

‎dist/windows/installer-translations/belarusian.nsh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_BELARUSIAN} "Uninstall qBittor
3636
LangString inst_arch_mismatch_x64_on_arm64 ${LANG_BELARUSIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
3737
;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
3838
LangString inst_arch_mismatch_arm64_on_x64 ${LANG_BELARUSIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
39-
;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
40-
LangString inst_already_running ${LANG_BELARUSIAN} "Another instance of the installer is already running."
39+
4140

4241
;------------------------------------
4342
;Uninstaller strings

‎dist/windows/installer-translations/bosnian.nsh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_BOSNIAN} "Uninstall qBittorren
3636
LangString inst_arch_mismatch_x64_on_arm64 ${LANG_BOSNIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
3737
;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
3838
LangString inst_arch_mismatch_arm64_on_x64 ${LANG_BOSNIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
39-
;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
40-
LangString inst_already_running ${LANG_BOSNIAN} "Another instance of the installer is already running."
39+
4140

4241
;------------------------------------
4342
;Uninstaller strings

‎dist/windows/installer-translations/breton.nsh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_BRETON} "Uninstall qBittorrent
3636
LangString inst_arch_mismatch_x64_on_arm64 ${LANG_BRETON} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
3737
;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
3838
LangString inst_arch_mismatch_arm64_on_x64 ${LANG_BRETON} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
39-
;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
40-
LangString inst_already_running ${LANG_BRETON} "Another instance of the installer is already running."
4139

4240
;------------------------------------
4341
;Uninstaller strings

‎dist/windows/installer-translations/bulgarian.nsh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_BULGARIAN} "Uninstall qBittorr
3636
LangString inst_arch_mismatch_x64_on_arm64 ${LANG_BULGARIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
3737
;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
3838
LangString inst_arch_mismatch_arm64_on_x64 ${LANG_BULGARIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
39-
;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
40-
LangString inst_already_running ${LANG_BULGARIAN} "Another instance of the installer is already running."
4139

4240
;------------------------------------
4341
;Uninstaller strings

‎dist/windows/installer-translations/catalan.nsh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_CATALAN} "Desinstal·lar qBitt
3636
LangString inst_arch_mismatch_x64_on_arm64 ${LANG_CATALAN} "Aquesta versió x64 de qBittorrent no pot funcionar en sistemes ARM64. Siusplau, descarrega l'instal·lador ARM64."
3737
;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
3838
LangString inst_arch_mismatch_arm64_on_x64 ${LANG_CATALAN} "Aquesta versió ARM64 de qBittorrent no pot funcionar en sistemes x64. Siusplau, descarrega l'instal·lador x64."
39-
;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
40-
LangString inst_already_running ${LANG_CATALAN} "Another instance of the installer is already running."
39+
4140

4241
;------------------------------------
4342
;Uninstaller strings

‎dist/windows/installer-translations/croatian.nsh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_CROATIAN} "Uninstall qBittorre
3636
LangString inst_arch_mismatch_x64_on_arm64 ${LANG_CROATIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
3737
;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
3838
LangString inst_arch_mismatch_arm64_on_x64 ${LANG_CROATIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
39-
;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
40-
LangString inst_already_running ${LANG_CROATIAN} "Another instance of the installer is already running."
4139

4240
;------------------------------------
4341
;Uninstaller strings

0 commit comments

Comments
 (0)