diff --git a/lib/libmd5sum/libmd5sum.c b/lib/libmd5sum/libmd5sum.c index 85878045a..9a47b39c5 100644 --- a/lib/libmd5sum/libmd5sum.c +++ b/lib/libmd5sum/libmd5sum.c @@ -9,7 +9,6 @@ #include "md5.h" #include "getline.h" #include -#include "error.h" #include #define STREQ(a, b) (strcmp ((a), (b)) == 0) diff --git a/src/gui/record_setup.cpp b/src/gui/record_setup.cpp index 6d390ccd6..c4487b9db 100644 --- a/src/gui/record_setup.cpp +++ b/src/gui/record_setup.cpp @@ -172,7 +172,9 @@ void CRecordSetup::showRecordSetup() //record dir CMenuForwarder* fRecDir = new CMenuForwarder(LOCALE_RECORDINGMENU_DEFDIR, true, g_settings.network_nfs_recordingdir, this, "recordingdir"); recordingSettings->addItem(fRecDir); - + CMenuOptionChooser* channel_rec_dir = new CMenuOptionChooser(LOCALE_RECORDINGMENU_SAVE_IN_CHANNELDIR, &g_settings.recording_save_in_channeldir, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); + recordingSettings->addItem(channel_rec_dir); + // //template // CStringInput * recordingSettings_filenameTemplate = new CStringInput(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, &g_settings.recording_filename_template[0], 21, LOCALE_RECORDINGMENU_FILENAME_TEMPLATE_HINT, LOCALE_IPSETUP_HINT_2, "%/-_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 "); // CMenuForwarder* mf11 = new CMenuForwarder(LOCALE_RECORDINGMENU_FILENAME_TEMPLATE, true, g_settings.recording_filename_template[0],recordingSettings_filenameTemplate);