Toolbar : add a null check

Change-Id: Ia0c5465f6d8a0b0a5aa7a96d79ea2f8a489b557b
Signed-off-by: heeyoung <heeyoung1008.hwang@samsung.com>

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java
index bde9cde..ee7ca7b 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/ToolbarArea.java
@@ -795,8 +795,8 @@ public class ToolbarArea {
                        PackageInfo pkgInfo = null;
                        String packageID = GlobalInformation.getCurrentDeviceInfo().getSelectedPackageID();
 
-                       if (null != packageID && DACommunicator.getPkgInfoByPkgId(packageID) != null) {
-                               pkgInfo = DACommunicator.getPkgInfoByPkgId(packageID);
+                       pkgInfo = DACommunicator.getPkgInfoByPkgId(packageID);
+                       if (null != packageID && pkgInfo != null) {
                                appCombo.setText(pkgInfo.getMainApp().getLabel());
                        } else {
                                pkgInfo = DACommunicator.getPkgInfoByLabel(pkgs.get(0));