[528837] "Bundle Pool:" disabling seems to have an issue

https://bugs.eclipse.org/bugs/show_bug.cgi?id=528837
diff --git a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductPage.java b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductPage.java
index 45537c9..158e052 100644
--- a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductPage.java
+++ b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductPage.java
@@ -421,13 +421,21 @@
 
     if (SHOW_BUNDLE_POOL_UI)
     {
-      initBundlePool();
-
-      poolButton = PersistentButton.create(lowerComposite, SWT.CHECK | SWT.RIGHT, true, new DialogSettingsPersistence(getDialogSettings(), "useBundlePool"));
+      DialogSettingsPersistence useBundlePool = new DialogSettingsPersistence(getDialogSettings(), "useBundlePool");
+      poolButton = PersistentButton.create(lowerComposite, SWT.CHECK | SWT.RIGHT, true, useBundlePool);
       AccessUtil.setKey(poolButton, "pools");
       poolButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
       poolButton.setText("Bundle Pool:");
 
+      if (poolButton.getSelection())
+      {
+        initBundlePool();
+      }
+      else
+      {
+        setCurrentBundlePool(null);
+      }
+
       poolButton.addSelectionListener(new SelectionAdapter()
       {
         @Override