From cfa6c887f1a9136f9ac96607fb3ff43be409bf99 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Mon, 8 Jan 2024 23:58:18 +0300
Subject: Fixed a bug in Switch Instance
 https://github.com/libredirect/browser_extension/issues/877

---
 src/assets/javascripts/services.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/assets')

diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js
index a1935bff..3aba28d7 100644
--- a/src/assets/javascripts/services.js
+++ b/src/assets/javascripts/services.js
@@ -617,7 +617,11 @@ function switchInstance(url, customService) {
 		if (customService) {
 			const instancesList = options[options[customService].frontend]
 			if (instancesList !== undefined) {
-				resolve(`${utils.getNextInstance(url.origin, instancesList)}${url.pathname}${url.search}`)
+				const newInstance = utils.getNextInstance(url.origin, instancesList)
+				if (newInstance) {
+					resolve(`${newInstance}${url.pathname}${url.search}`)
+					return
+				}
 			}
 		} else {
 			for (const service in config.services) {
@@ -630,8 +634,11 @@ function switchInstance(url, customService) {
 					resolve()
 					return
 				}
-				resolve(`${utils.getNextInstance(url.origin, instancesList)}${url.pathname}${url.search}`)
-				return
+				const newInstance = utils.getNextInstance(url.origin, instancesList)
+				if (newInstance) {
+					resolve(`${newInstance}${url.pathname}${url.search}`)
+					return
+				}
 			}
 		}
 		resolve()
-- 
cgit 1.4.1