From e40569a46fb57d4adc0308c4df97fdf01231daac Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Mon, 5 Sep 2016 19:00:42 +0200 Subject: [PATCH] Fix When we select two node linked and delete them the link remain Fix https://github.com/GNS3/gns3-gui/issues/1469 --- gns3server/controller/udp_link.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gns3server/controller/udp_link.py b/gns3server/controller/udp_link.py index 830d4e39..81fdd563 100644 --- a/gns3server/controller/udp_link.py +++ b/gns3server/controller/udp_link.py @@ -81,8 +81,11 @@ class UDPLink(Link): port_number1 = self._nodes[0]["port_number"] except IndexError: return - - yield from node1.delete("/adapters/{adapter_number}/ports/{port_number}/nio".format(adapter_number=adapter_number1, port_number=port_number1)) + try: + yield from node1.delete("/adapters/{adapter_number}/ports/{port_number}/nio".format(adapter_number=adapter_number1, port_number=port_number1)) + # If the node is already delete (user selected multiple element and delete all in the same time) + except aiohttp.web.HTTPNotFound: + pass try: node2 = self._nodes[1]["node"] @@ -90,7 +93,11 @@ class UDPLink(Link): port_number2 = self._nodes[1]["port_number"] except IndexError: return - yield from node2.delete("/adapters/{adapter_number}/ports/{port_number}/nio".format(adapter_number=adapter_number2, port_number=port_number2)) + try: + yield from node2.delete("/adapters/{adapter_number}/ports/{port_number}/nio".format(adapter_number=adapter_number2, port_number=port_number2)) + # If the node is already delete (user selected multiple element and delete all in the same time) + except aiohttp.web.HTTPNotFound: + pass @asyncio.coroutine def start_capture(self, data_link_type="DLT_EN10MB", capture_file_name=None):