From 41108bafca19e98e8a98824874a77812207d0f3f Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Mon, 19 Nov 2012 02:32:06 +0100 Subject: [PATCH] Software Update: /var/etc/update.urls is excluded from saving - Message 'Setting takeover successfully...' removed Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/04e71239f2b4a68ab11205f02d9f9702dd232003 Author: Michael Liebmann Date: 2012-11-19 (Mon, 19 Nov 2012) Origin message was: ------------------ * Software Update: /var/etc/update.urls is excluded from saving - Message 'Setting takeover successfully...' removed ------------------ This commit was generated by Migit --- data/settingsupdate.conf | 1 + src/gui/ext_update.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/data/settingsupdate.conf b/data/settingsupdate.conf index d12e5b7e2..45eafcac9 100644 --- a/data/settingsupdate.conf +++ b/data/settingsupdate.conf @@ -33,6 +33,7 @@ #---------------------------------------------------------------------------------------- ## von der Sicherung auszuschließende Dateien, gekennzeichnet durch ein vorangestelltes - #---------------------------------------------------------------------------------------- +-/var/etc/update.urls -/var/tuxbox/config/cables.xml -/var/tuxbox/config/encoding.conf -/var/tuxbox/config/providermap.xml diff --git a/src/gui/ext_update.cpp b/src/gui/ext_update.cpp index 2e0215c82..7e4d430e4 100644 --- a/src/gui/ext_update.cpp +++ b/src/gui/ext_update.cpp @@ -155,7 +155,6 @@ bool CExtUpdate::applySettings(const std::string & filename, int mode) return false; } } - ShowMsgUTF(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_FLASHUPDATE_UPDATE_WITH_SETTINGS_SUCCESSFULLY), CMessageBox::mbrOk, CMessageBox::mbOk, NEUTRINO_ICON_INFO); WRITE_UPDATE_LOG("\n"); WRITE_UPDATE_LOG("##### Settings taken. #####\n"); if (mode == MODE_EXPERT)