From fb546b1450c1a506ebad2e7f2e95aef20c8ad84a Mon Sep 17 00:00:00 2001
From: cc <cc@hydra.(none)>
Date: Sat, 28 May 2011 16:02:21 +0200
Subject: [PATCH] bug fix: overwrite "viewport" option parameter instead of appending it when moving window to viewport

---
 src/put.cpp |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/put.cpp b/src/put.cpp
index 0c3700e..ebfe7d1 100644
--- a/src/put.cpp
+++ b/src/put.cpp
@@ -1181,10 +1181,19 @@ PutScreen::toViewport (CompAction         *action,
 		       CompOption::Vector &option,
 		       int vp)
 {
-    int last = option.size ();
-    option.resize(last+1);
-    option[last].setName ("viewport",CompOption::TypeInt);
-    option[last].value ().set (vp-1);
+    CompOption *o = CompOption::findOption (option, "viewport");
+
+    if (o)
+    {
+        o->value ().set (vp-1);
+    }
+    else
+    {
+        int last = option.size ();
+        option.resize(last+1);
+        option[last].setName ("viewport",CompOption::TypeInt);
+        option[last].value ().set (vp-1);
+    }
 
     return initiateCommon (action, state, option, (PutType) PutViewport);
 }
-- 
1.7.4.1