diff options
Diffstat (limited to 'libjava/java/awt/KeyboardFocusManager.java')
| -rw-r--r-- | libjava/java/awt/KeyboardFocusManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libjava/java/awt/KeyboardFocusManager.java b/libjava/java/awt/KeyboardFocusManager.java index 8ebd9e1713c..e82c0d48825 100644 --- a/libjava/java/awt/KeyboardFocusManager.java +++ b/libjava/java/awt/KeyboardFocusManager.java @@ -246,7 +246,10 @@ public abstract class KeyboardFocusManager */ public Component getFocusOwner () { - return (Component) getObject (currentFocusOwners); + Component owner = (Component) getObject (currentFocusOwners); + if (owner == null) + owner = (Component) getObject (currentPermanentFocusOwners); + return owner; } /** |