sendTo and goto workspaces both need to start at 0, not 1

[chaz/openbox] / util / epist / actions.cc

diff --git a/util/epist/actions.cc b/util/epist/actions.cc
index afe33e3575e1ce230f29822419448a5edabc330f..c4874983e51e50119d34a59bceca74ac385c1c88 100644 (file)
--- a/util/epist/actions.cc
+++ b/util/epist/actions.cc
@@ -39,13 +39,20 @@ Action::Action(enum ActionType type, KeyCode keycode, unsigned int modifierMask,
 
   for (int i = 0; str_types[i] != noaction; ++i) {
     if (type == str_types[i]) {
-      _stringParam = str;
+      // the first and last characters of the string are quotes, and we need to
+      // get rid of them
+      assert(str.size() >= 2);
+      assert(str[0] == '"');
+      assert(str[str.size() - 1] == '"');
+
+      _stringParam = str.substr(1, str.size() - 2);
       return;
     }
   }
   
   _numberParam = atoi( str.c_str() );
 
-  if (type == changeWorkspace)  // workspace 1 to the user is workspace 0 to us
+  // workspace 1 to the user is workspace 0 to us
+  if (type == changeWorkspace || type == sendToWorkspace)
     _numberParam--;
 }