X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2FLibCecTray%2Fsettings%2FCECSettingNumeric.cs;h=903891536b55fdddd972d56131c5412d89ab4c58;hb=8fad0fe870edcd90e4788d8b56da80ab29c9e016;hp=cee77e3133866eea659c06230d9bf4a02273a7fc;hpb=f017f3c49b9136fbffe49fa3eaf372c51617140d;p=deb_libcec.git

diff --git a/src/LibCecTray/settings/CECSettingNumeric.cs b/src/LibCecTray/settings/CECSettingNumeric.cs
index cee77e3..9038915 100644
--- a/src/LibCecTray/settings/CECSettingNumeric.cs
+++ b/src/LibCecTray/settings/CECSettingNumeric.cs
@@ -1,7 +1,7 @@
 /*
  * This file is part of the libCEC(R) library.
  *
- * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited.  All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited.  All rights reserved.
  * libCEC(R) is an original work, containing original code.
  *
  * libCEC(R) is a trademark of Pulse-Eight Limited.
@@ -158,10 +158,13 @@ namespace LibCECTray.settings
 
       ResetItems(BaseItems.Count == 0);
 
-      control.SelectedValueChanged += delegate
-                                        {
-                                          Value = BaseItems[control.SelectedIndex];
-                                        };
+      if (BaseItems.Count > 0 && control.SelectedIndex < BaseItems.Count)
+      {
+        control.SelectedValueChanged += delegate
+                                          {
+                                            Value = BaseItems[control.SelectedIndex];
+                                          };
+      }
     }
 
     public override Control ValueControl