# HG changeset patch # User dadubrow # Date 1280864542 18000 # Node ID bd6f1436505ab42747883994e08c7476efe9ebbc # Parent a1e1c11d5a44d0bd39ce6d0a5ff7a0a419372b3d ensure sdk mgr for both pref page and portal layer diff -r a1e1c11d5a44 -r bd6f1436505a core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java --- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java Tue Aug 03 14:05:25 2010 -0500 +++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/sdk/ui/SDKPreferencePage.java Tue Aug 03 14:42:22 2010 -0500 @@ -104,7 +104,8 @@ * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) */ public void init(IWorkbench workbench) { - sdkMgr = SDKCorePlugin.getSDKManager(); + if (sdkMgr == null) + sdkMgr = SDKCorePlugin.getSDKManager(); if (sdkMgr != null) sdkList = sdkMgr.getSDKList(); } @@ -115,6 +116,8 @@ public void createControl(Composite parent) { IPreferenceStore prefsStore = SDKUIPlugin.getDefault().getPreferenceStore(); + if (sdkMgr == null) + sdkMgr = SDKCorePlugin.getSDKManager(); if (sdkMgr == null){ return; }