Move some inits to cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit

2 files changed, 14 insertions, 7 deletions

diff --git a/recmenus.c b/recmenus.c
index c664e93..4bd9bf5 100644
--- a/recmenus.c
+++ b/recmenus.c
@@ -757,6 +757,13 @@ cRecMenuSearchTimerEdit::cRecMenuSearchTimerEdit(cTVGuideSearchTimer searchTimer
     compareSummary = searchTimer.CompareSummary();
     useInFavorites = searchTimer.UseInFavorites();
 
+    searchTimer.GetSearchModes(&searchModes);
+    searchTimer.GetUseChannelModes(&useChannelModes);
+    searchTimer.GetCompareDateModes(&compareDateModes);
+    searchTimer.GetSearchTimerModes(&searchTimerModes);
+    searchTimer.GetDelModes(&delModes);
+    channelgroupIndex = SplitChannelGroups(&channelGroups, &channelgroups);
+
     SetWidthPercent(70);
     cString infoText;
     if (searchTimer.GetID() > -1) {
@@ -806,12 +813,6 @@ void cRecMenuSearchTimerEdit::InitMenuItems(void) {
     useDayOfWeekPos = 8;
     avoidRepeatsPos = 14;
 
-    std::vector<std::string> searchModes;
-    searchTimer.GetSearchModes(&searchModes);
-    std::vector<std::string> useChannelModes;
-    searchTimer.GetUseChannelModes(&useChannelModes);
-    channelgroupIndex = SplitChannelGroups(&channelGroups, &channelgroups);
-
     mainMenuItems.push_back(new cRecMenuItemText(tr("Search String"), searchString, TEXTINPUTLENGTH, false, searchString));
     mainMenuItems.push_back(new cRecMenuItemBool(tr("Active"), timerActive, false, false, &timerActive, rmsSearchTimerSave));
     mainMenuItems.push_back(new cRecMenuItemSelect(tr("Search Mode"), searchModes, mode, false, &mode, rmsSearchTimerSave));
diff --git a/recmenus.h b/recmenus.h
index e506a9e..17e5517 100644
--- a/recmenus.h
+++ b/recmenus.h
@@ -208,7 +208,14 @@ public:
 class cRecMenuSearchTimerEdit: public cRecMenu {

 private:

     cTVGuideSearchTimer searchTimer;

+    cTVGuideSearchTimer sT;

+    std::vector<std::string> searchModes;

+    std::vector<std::string> useChannelModes;

     std::vector<std::string> channelGroups;

+    std::vector<std::string> compareDateModes;

+    std::vector<std::string> searchTimerModes;

+    std::vector<std::string> delModes;

+    std::vector<std::string> channelgroups;

     std::vector<cRecMenuItem*> mainMenuItems;

     std::vector<cRecMenuItem*> currentMenuItems;

     int numMenuItems;

@@ -226,7 +233,6 @@ private:
     int startChannel;

     int stopChannel;

     std::string  channelGroup;

-    std::vector<std::string> channelgroups;

     int channelgroupIndex;

     bool useTime;

     int startTime;