From 03bf81cc1bede0c5cec74a4045c94535758de25a Mon Sep 17 00:00:00 2001
From: filtered <176114999+webfiltered@users.noreply.github.com>
Date: Tue, 11 Mar 2025 23:25:16 +1100
Subject: [PATCH] [Cleanup] Remove redundant reroute opt-in setting (#2972)

Co-authored-by: github-actions <github-actions@github.com>
---
 src/composables/useLitegraphSettings.ts | 9 ---------
 src/constants/coreSettings.ts           | 8 ++++----
 src/locales/en/settings.json            | 2 +-
 src/services/workflowService.ts         | 4 +++-
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/composables/useLitegraphSettings.ts b/src/composables/useLitegraphSettings.ts
index 8ca88a2d7..c61d00395 100644
--- a/src/composables/useLitegraphSettings.ts
+++ b/src/composables/useLitegraphSettings.ts
@@ -77,15 +77,6 @@ export const useLitegraphSettings = () => {
     }
   })
 
-  watchEffect(() => {
-    const reroutesEnabled = settingStore.get('Comfy.RerouteBeta')
-    const { canvas } = canvasStore
-    if (canvas) {
-      canvas.reroutesEnabled = reroutesEnabled
-      canvas.setDirty(false, true)
-    }
-  })
-
   watchEffect(() => {
     const maximumFps = settingStore.get('LiteGraph.Canvas.MaximumFps')
     const { canvas } = canvasStore
diff --git a/src/constants/coreSettings.ts b/src/constants/coreSettings.ts
index cd27c197f..2ec330372 100644
--- a/src/constants/coreSettings.ts
+++ b/src/constants/coreSettings.ts
@@ -528,12 +528,12 @@ export const CORE_SETTINGS: SettingParams[] = [
     id: 'Comfy.RerouteBeta',
     category: ['LiteGraph', 'RerouteBeta'],
     name: 'Opt-in to the reroute beta test',
-    tooltip:
-      'Enables the new native reroutes.\n\nReroutes can be added by holding alt and dragging from a link line, or on the link menu.\n\nDisabling this option is non-destructive - reroutes are hidden.',
-    experimental: true,
+    tooltip: 'No longer has any effect; reroutes are always enabled.',
+    deprecated: true,
     type: 'boolean',
     defaultValue: false,
-    versionAdded: '1.3.42'
+    versionAdded: '1.3.42',
+    versionModified: '1.13.3'
   },
   {
     id: 'Comfy.Graph.LinkMarkers',
diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json
index d8d4c701f..9144f2c51 100644
--- a/src/locales/en/settings.json
+++ b/src/locales/en/settings.json
@@ -245,7 +245,7 @@
   },
   "Comfy_RerouteBeta": {
     "name": "Opt-in to the reroute beta test",
-    "tooltip": "Enables the new native reroutes.\n\nReroutes can be added by holding alt and dragging from a link line, or on the link menu.\n\nDisabling this option is non-destructive - reroutes are hidden."
+    "tooltip": "No longer has any effect; reroutes are always enabled."
   },
   "Comfy_Sidebar_Location": {
     "name": "Sidebar location",
diff --git a/src/services/workflowService.ts b/src/services/workflowService.ts
index 73779d74a..f659478b6 100644
--- a/src/services/workflowService.ts
+++ b/src/services/workflowService.ts
@@ -332,7 +332,9 @@ export const useWorkflowService = () => {
       skip_events: true,
       skip_render: true
     })
-    canvas.reroutesEnabled = app.canvas.reroutesEnabled
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore Temporary fix for Litegraph issue.
+    canvas.reroutesEnabled = true
     canvas.selectItems()
     canvas.copyToClipboard()
     app.canvas.pasteFromClipboard(options)