X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fexecute.c;h=4d29fc19bd682ff1fa7de68ad5da51b64dcb9933;hb=2972e2f728aae0ebd4a689628856a8e6d4295bac;hp=05ab2ef3c6fda7085c8fbf0aea0cd59f078d9567;hpb=d78ae0546dae17eda6084a1bd33e63637ba802e5;p=chaz%2Fopenbox

diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index 05ab2ef3..4d29fc19 100644
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -144,7 +144,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     if (data->client) {
         gchar *c, *before, *expand;
 
-        /* replace occurances of $pid and $window */
+        /* replace occurrences of $pid and $wid */
 
         expand = NULL;
         before = cmd;
@@ -168,13 +168,12 @@ static gboolean run_func(ObActionsData *data, gpointer options)
 
                 before = c + 4; /* 4 = strlen("$pid") */
             }
-
-            if ((c[1] == 'w' || c[1] == 'W') &&
-                (c[2] == 'i' || c[2] == 'I') &&
-                (c[3] == 'd' || c[3] == 'D') &&
-                !g_ascii_isalnum(c[7]))
+            else if ((c[1] == 'w' || c[1] == 'W') &&
+                     (c[2] == 'i' || c[2] == 'I') &&
+                     (c[3] == 'd' || c[3] == 'D') &&
+                     !g_ascii_isalnum(c[4]))
             {
-                /* found $window */
+                /* found $wid */
                 gchar *tmp;
 
                 *c = '\0';
@@ -185,8 +184,10 @@ static gboolean run_func(ObActionsData *data, gpointer options)
                                          data->client->window);
                 g_free(tmp);
 
-                before = c + 7; /* 4 = strlen("$window") */
+                before = c + 4; /* 4 = strlen("$wid") */
             }
+            else
+                before = c + 1; /* no infinite loops plz */
         }
 
         if (expand) {