From feedcedcb5134ed7ed05fec5b714ad4e0aecf9bd Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Mon, 27 Apr 2009 07:08:09 +0000 Subject: [PATCH] BF[2548885] search window problem - null checking needed to handle potential user cancel --- .../org/adempiere/webui/desktop/TabbedDesktop.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/desktop/TabbedDesktop.java b/zkwebui/WEB-INF/src/org/adempiere/webui/desktop/TabbedDesktop.java index 0d54790383..699ab01ba3 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/desktop/TabbedDesktop.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/desktop/TabbedDesktop.java @@ -192,8 +192,10 @@ public abstract class TabbedDesktop extends AbstractDesktop { ADWindow wnd = new ADWindow(Env.getCtx(), AD_Window_ID, query); DesktopTabpanel tabPanel = new DesktopTabpanel(); - wnd.createPart(tabPanel); - windowContainer.insertAfter(windowContainer.getSelectedTab(), tabPanel, wnd.getTitle(), true, true); + if (wnd.createPart(tabPanel) != null) + { + windowContainer.insertAfter(windowContainer.getSelectedTab(), tabPanel, wnd.getTitle(), true, true); + } } /** @@ -205,8 +207,10 @@ public abstract class TabbedDesktop extends AbstractDesktop { ADWindow wnd = new ADWindow(Env.getCtx(), AD_Window_ID, query); DesktopTabpanel tabPanel = new DesktopTabpanel(); - wnd.createPart(tabPanel); - windowContainer.addWindow(tabPanel, wnd.getTitle(), true); + if (wnd.createPart(tabPanel) != null) + { + windowContainer.addWindow(tabPanel, wnd.getTitle(), true); + } } /**