From fe45b917be7d5a574ff67282b809ef8ab13093f2 Mon Sep 17 00:00:00 2001
From: Johannes Mockenhaupt <git@jotomo.de>
Date: Wed, 1 Nov 2017 23:25:37 +0100
Subject: [PATCH] Align Combo with recent preferences updates.

---
 .../java/info/nightscout/androidaps/PreferencesActivity.java | 4 ++++
 .../nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
index b78848f1b5..ed967c2a18 100644
--- a/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
@@ -165,6 +165,10 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
                     }
                 }
 
+                if (Config.COMBO) {
+                    addPreferencesFromResourceIfEnabled(ComboPlugin.getPlugin(), PluginBase.PUMP);
+                }
+
                 addPreferencesFromResourceIfEnabled(VirtualPumpPlugin.getPlugin(), PluginBase.PUMP);
 
                 addPreferencesFromResourceIfEnabled(InsulinOrefFreePeakPlugin.getPlugin(), PluginBase.INSULIN);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
index 9c90b896e5..b848ea1c77 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
@@ -186,6 +186,11 @@ public class ComboPlugin implements PluginBase, PumpInterface, ConstraintsInterf
         if (type == PUMP) this.fragmentVisible = fragmentVisible;
     }
 
+    @Override
+    public int getPreferencesId() {
+        return R.xml.pref_combo;
+    }
+
     @Override
     public int getType() {
         return PluginBase.PUMP;