X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.cc;h=8163107391de84ea015d1bbf3597096054342b20;hb=551a17d2563679eb6ef7c650f1384ee7e48dbc29;hp=d767c268136460746db411b83b4bee3e6fc14040;hpb=75b6a5a378966efc09c355109ab42467ddc6d845;p=chaz%2Fopenbox

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index d767c268..81631073 100644
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -475,6 +475,7 @@ void screen::cycleWindow(const bool forward, const int increment,
                          const bool allscreens, const bool alldesktops,
                          const bool sameclass, const string &cn) const {
   assert(_managed);
+  assert(increment > 0);
 
   if (_clients.empty()) return;
 
@@ -486,7 +487,7 @@ void screen::cycleWindow(const bool forward, const int increment,
     begin = _clients.begin(),
     end = _clients.end();
 
-  const XWindow *t;
+  const XWindow *t = 0;
   
   for (int x = 0; x < increment; ++x) {
     while (1) {
@@ -499,8 +500,7 @@ void screen::cycleWindow(const bool forward, const int increment,
       } else {
         if (target == begin)
           target = end;
-        for (int x = 0; x < increment; ++x)
-          --target;
+        --target;
       }
 
       // must be no window to focus
@@ -532,8 +532,10 @@ void screen::cycleWindow(const bool forward, const int increment,
 }
 
 
-void screen::cycleWorkspace(const bool forward, const int increment, const bool loop) const {
+void screen::cycleWorkspace(const bool forward, const int increment,
+                            const bool loop) const {
   assert(_managed);
+  assert(increment > 0);
 
   unsigned int destination = _active_desktop;