From 5d8e3f58f68749f2e88997e4deb94a2ef3dc1945 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Fri, 28 Sep 2012 19:29:14 +0200
Subject: [PATCH] Fix 'border toggle' (it "skipped" 1px border) (Thanks joepd)

fixes #818
---
 src/commands.c                  | 6 +++---
 testcases/t/169-border-toggle.t | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/commands.c b/src/commands.c
index 000dd208..607e1c11 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -799,11 +799,11 @@ void cmd_border(I3_CMD, char *border_style_str, char *border_width ) {
             border_style++;
             border_style %= 3;
             if (border_style == BS_NORMAL)
-                current->con->current_border_width = 2;
+                tmp_border_width = 2;
             else if (border_style == BS_NONE)
-                current->con->current_border_width = 0;
+                tmp_border_width = 0;
             else if (border_style == BS_PIXEL)
-                current->con->current_border_width = 1;
+                tmp_border_width = 1;
         } else {
             if (strcmp(border_style_str, "normal") == 0)
                 border_style = BS_NORMAL;
diff --git a/testcases/t/169-border-toggle.t b/testcases/t/169-border-toggle.t
index 33f3a8ec..c89dcc76 100644
--- a/testcases/t/169-border-toggle.t
+++ b/testcases/t/169-border-toggle.t
@@ -29,25 +29,31 @@ is($nodes[0]->{border}, 'normal', 'border style normal');
 cmd 'border 1pixel';
 @nodes = @{get_ws_content($tmp)};
 is($nodes[0]->{border}, 'pixel', 'border style 1pixel');
+is($nodes[0]->{current_border_width}, 1, 'border width = 1px');
 
 cmd 'border none';
 @nodes = @{get_ws_content($tmp)};
 is($nodes[0]->{border}, 'none', 'border style none');
+is($nodes[0]->{current_border_width}, 0, 'border width = 0px');
 
 cmd 'border normal';
 @nodes = @{get_ws_content($tmp)};
 is($nodes[0]->{border}, 'normal', 'border style back to normal');
+is($nodes[0]->{current_border_width}, 2, 'border width = 2px');
 
 cmd 'border toggle';
 @nodes = @{get_ws_content($tmp)};
 is($nodes[0]->{border}, 'none', 'border style none');
+is($nodes[0]->{current_border_width}, 0, 'border width = 0px');
 
 cmd 'border toggle';
 @nodes = @{get_ws_content($tmp)};
 is($nodes[0]->{border}, 'pixel', 'border style 1pixel');
+is($nodes[0]->{current_border_width}, 1, 'border width = 1px');
 
 cmd 'border toggle';
 @nodes = @{get_ws_content($tmp)};
 is($nodes[0]->{border}, 'normal', 'border style back to normal');
+is($nodes[0]->{current_border_width}, 2, 'border width = 2px');
 
 done_testing;