no need to check settings
authorMikael Magnusson <mikachu@gmail.com>
Fri, 19 Feb 2010 21:54:27 +0000 (22:54 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Fri, 19 Feb 2010 21:54:27 +0000 (22:54 +0100)
it's always allocated, and the next line doesn't check it anyway

openbox/client.c

index a86bb3a..4d54b38 100644 (file)
@@ -372,7 +372,7 @@ void client_manage(Window window, ObPrompt *prompt)
         /* NET_WM_USER_TIME 0 when mapping means don't focus */
         (user_time != 0) &&
         /* this checks for focus=false for the window */
-        (!settings || settings->focus != 0) &&
+        settings->focus != 0 &&
         focus_valid_target(self, FALSE, FALSE, TRUE, FALSE, FALSE,
                            settings->focus == 1))
     {