return None (instead of crash) when list is empty, and getCurrent is called

[enigma2.git] / data / menu.xml

diff --git a/data/menu.xml b/data/menu.xml
index 4c530fe0e0f8136b48cb26e208fa9c47f4e6d3e0..d562ab3b434ef7d0834ddc004728181bc6014576 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -62,7 +62,11 @@
                                <!--<item text="Keyboard"><setup id="keyboard" /></item>-->
                                <!--<item text="OSD"><setup id="osd" /></item>-->
                                <item><setup id="lcd" /></item>
-                               <item text="Network..."><screen module="NetworkSetup" screen="NetworkSetup" /></item>
+                               <menu text="Network...">
+                                       <id val="network" />
+                                       <item text="Device Setup..."><screen module="NetworkSetup" screen="NetworkAdapterSelection"/></item>
+                                       <item text="Nameserver Setup..."><screen module="NetworkSetup" screen="NameserverSetup"/></item>
+                               </menu>
                        </menu>
                        <item text="Common Interface"><screen module="Ci" screen="CiSelection" /></item>
                        <item text="Parental control"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item>
@@ -74,7 +78,8 @@
                <menu text="Standby / Restart">
                        <id val="shutdown" />
                        <!--<item text="Standby"><code>quitMainloop(0)</code></item>-->
-                       <item text="Restart"><code>quitMainloop(2)</code></item>
-                       <item text="Deep Standby"><code>quitMainloop(1)</code></item>
+                       <item text="Standby"><screen module="Standby" screen="Standby"/></item>
+                       <item text="Restart"><screen module="Standby" screen="TryQuitMainloop">2</screen></item>
+                       <item text="Deep Standby"><screen module="Standby" screen="TryQuitMainloop">1</screen></item>
                </menu>
 </menu>