From 03fe74c1957ddec51213c09493de129c27643075 Mon Sep 17 00:00:00 2001 From: Blake Harnden <32446120+bharnden@users.noreply.github.com> Date: Tue, 28 Mar 2023 12:37:25 -0700 Subject: [PATCH] gui: fix issue when joining a session with an rj45 node and assigning an interface, whichw ill later cause an error when configuring the rj45 node --- daemon/core/gui/graph/edges.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/core/gui/graph/edges.py b/daemon/core/gui/graph/edges.py index 8bb97962..9032659c 100644 --- a/daemon/core/gui/graph/edges.py +++ b/daemon/core/gui/graph/edges.py @@ -5,7 +5,7 @@ import tkinter as tk from typing import TYPE_CHECKING, Optional, Tuple, Union from core.api.grpc.wrappers import Interface, Link -from core.gui import themes +from core.gui import nodeutils, themes from core.gui.dialogs.linkconfig import LinkConfigurationDialog from core.gui.frames.link import EdgeInfoFrame, WirelessEdgeInfoFrame from core.gui.graph import tags @@ -638,10 +638,10 @@ class CanvasEdge(Edge): self.check_wireless() if link is None: link = self.app.core.ifaces_manager.create_link(self) - if link.iface1: + if link.iface1 and not nodeutils.is_rj45(self.src.core_node): iface1 = link.iface1 self.src.ifaces[iface1.id] = iface1 - if link.iface2: + if link.iface2 and not nodeutils.is_rj45(self.dst.core_node): iface2 = link.iface2 self.dst.ifaces[iface2.id] = iface2 self.token = create_edge_token(link)