[Libreoffice-commits] core.git: qadevOOo/runner

[Robert Antoni Buj i Gelonch]

 qadevOOo/runner/util/AccessibilityTools.java |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 23e4eb6aeb77c74f5ff8a6a70f7adbe52e1c34e7
Author: Robert Antoni Buj i Gelonch <robert.buj at gmail.com>
Date:   Sat Oct 11 20:27:09 2014 +0200

    runner: Null pointer dereference
    
    Change-Id: Id38a9e0bddbf3c9038abbc5de7137ee5d3f39db6
    Reviewed-on: https://gerrit.libreoffice.org/11924
    Reviewed-by: Matthew Francis <mjay.francis at gmail.com>
    Tested-by: Matthew Francis <mjay.francis at gmail.com>

diff --git a/qadevOOo/runner/util/AccessibilityTools.java b/qadevOOo/runner/util/AccessibilityTools.java
index 76136e6..a0f1612 100644
--- a/qadevOOo/runner/util/AccessibilityTools.java
+++ b/qadevOOo/runner/util/AccessibilityTools.java
@@ -65,13 +65,13 @@ public class AccessibilityTools {
 
             if (xFrame == null) {
                 System.out.println("can't get frame from controller");
+            } else {
+                if (containerWindow)
+                    xWindow = xFrame.getContainerWindow();
+                else
+                    xWindow = xFrame.getComponentWindow();
             }
 
-            if (containerWindow)
-                xWindow = xFrame.getContainerWindow();
-            else
-                xWindow = xFrame.getComponentWindow();
-
             if (xWindow == null) {
                 System.out.println("can't get window from frame");
             }