X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.cc;h=475a96e20f95581b766e4aec3f44ece9e3580ccf;hb=8e601e4a64b37f333fc3a5f844e4d72d6f289415;hp=fd65db4c5e6796f8a1ac9a688ee50a486b5819d9;hpb=c517f511000c8ec775f7413527b9e276b7995806;p=chaz%2Fopenbox

diff --git a/util/epist/screen.cc b/util/epist/screen.cc
index fd65db4c..475a96e2 100644
--- a/util/epist/screen.cc
+++ b/util/epist/screen.cc
@@ -145,29 +145,33 @@ void screen::processEvent(const XEvent &e) {
 void screen::handleKeypress(const XEvent &e) {
   ActionList::const_iterator it = _epist->actions().begin();
   ActionList::const_iterator end = _epist->actions().end();
-  cout << "key press\n";
   for (; it != end; ++it) {
     if (e.xkey.keycode == it->keycode() &&
         e.xkey.state == it->modifierMask()) {
       switch (it->type()) {
       case Action::nextWorkspace:
         cycleWorkspace(true);
-        break;
+        return;
 
       case Action::prevWorkspace:
         cycleWorkspace(false);
-        break;
+        return;
 
       case Action::changeWorkspace:
         changeWorkspace(it->number());
-        break;
-
-      case Action::shade:
-        (*_active)->shade(! (*_active)->shaded());
-        break;
+        return;
       }
 
-      break;
+      // these actions require an active window
+      if (_active != _clients.end()) {
+        XWindow *window = *_active;
+
+        switch (it->type()) {
+        case Action::shade:
+          window->shade(! window->shaded());
+          return;
+        }
+      }
     }
   }
 }