From 3b76f29ee64d9c3ec75a2d3c69c0705baf64aabe Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Thu, 14 Sep 2017 16:47:43 +0200
Subject: [PATCH] fix merge error

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/95d09d638b0ce988fec42ef74ceb7bc87359c844
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)

Origin message was:
------------------
- fix merge error
---
 src/gui/update_settings.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/update_settings.cpp b/src/gui/update_settings.cpp
index 07af0c87a..a4ba49bd5 100644
--- a/src/gui/update_settings.cpp
+++ b/src/gui/update_settings.cpp
@@ -60,6 +60,7 @@ CUpdateSettings::~CUpdateSettings()
 #endif
 }
 
+#if ENABLE_EXTUPDATE
 #define SOFTUPDATE_NAME_MODE1_OPTION_COUNT 3
 const CMenuOptionChooser::keyval SOFTUPDATE_NAME_MODE1_OPTIONS[SOFTUPDATE_NAME_MODE1_OPTION_COUNT] =
 {