initialize _font

[chaz/openbox] / src / client.cc

diff --git a/src/client.cc b/src/client.cc
index f9676e7cf7eebd3bbb8cc87722d5f84cb80c7cb5..3dc6237f1a36e2e6cdfa6ae99fb3ec466fda3977 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -1237,9 +1237,9 @@ const Icon *Client::icon(const otk::Size &s) const
       li = i;
     }
   }
-  if (smallest == 0xffffffff) // didnt find one bigger than us...
-    return &_icons[li];
-  return &_icons[si];
+  if (largest == 0) // didnt find one smaller than the requested size
+    return &_icons[si];
+  return &_icons[li];
 }
 
 void Client::move(int x, int y)
@@ -1717,8 +1717,6 @@ bool Client::focus()
   // visible on the screen
   if (!(frame->visible() && (_can_focus || _focus_notify))) return false;
 
-  if (_focused) return true;
-
   // do a check to see if the window has already been unmapped or destroyed
   // do this intelligently while watching out for unmaps we've generated
   // (ignore_unmaps > 0)
@@ -1762,8 +1760,6 @@ bool Client::focus()
 
 void Client::unfocus() const
 {
-  if (!_focused) return;
-
   assert(openbox->focusedClient() == this);
   openbox->setFocusedClient(0);
 }