From: marko <marko>
Date: Tue, 8 Nov 2005 13:12:31 +0000 (+0000)
Subject: Fix a bug in mergeLink.
X-Git-Url: https://git.entuzijast.net/?a=commitdiff_plain;h=2f1b7931aded161f2f9cca14d5ce7c022263c823;p=imunes.git

Fix a bug in mergeLink.

Bug found by:	Gledec
Submitted by:
Requested by:	Gledec
Reviewed by:	Gledec
Approved by:	Gledec
Obtained from:
---

diff --git a/initgui.tcl b/initgui.tcl
index f089907..a019257 100755
--- a/initgui.tcl
+++ b/initgui.tcl
@@ -298,7 +298,7 @@ scrollbar .vframe.scroll -command "$c yview" \
 	-bd 1 -width 14
 scrollbar .hframe.ts -orient horiz -command "" \
 	-bd 1 -width 14
-#pack .hframe.ts .hframe.t -side left -padx 0 -pady 0
+pack .hframe.ts .hframe.t -side left -padx 0 -pady 0
 pack .hframe.scroll -side left -padx 0 -pady 0 -fill both -expand true
 pack .vframe.scroll -side top -padx 0 -pady 0 -fill both -expand true
 pack .grid -expand yes -fill both -padx 1 -pady 1
diff --git a/linkcfg.tcl b/linkcfg.tcl
index 5ada454..86c613f 100755
--- a/linkcfg.tcl
+++ b/linkcfg.tcl
@@ -335,10 +335,10 @@ proc mergeLink { link } {
 
     set ifc1 [ifcByPeer $orig_node1 $pseudo_node1]
     set ifc2 [ifcByPeer $orig_node2 $pseudo_node2]
-    set i [lsearch [set $orig_node1] "interface-peer {* $pseudo_node2}"]
+    set i [lsearch [set $orig_node1] "interface-peer {* $pseudo_node1}"]
     set $orig_node1 [lreplace [set $orig_node1] $i $i \
 			"interface-peer {$ifc1 $orig_node2}"]
-    set i [lsearch [set $orig_node2] "interface-peer {* $pseudo_node1}"]
+    set i [lsearch [set $orig_node2] "interface-peer {* $pseudo_node2}"]
     set $orig_node2 [lreplace [set $orig_node2] $i $i \
 			"interface-peer {$ifc2 $orig_node1}"]