2 files changed, 7 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 58665d2..aaa7761 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,8 @@
 VDR Plugin 'dvdswitch' Revision History
 ---------------------------------------
+
+- Fix: Crash when image directory is empty, Patch from Matthias Schwarzott (#1308)
+
 2012-10-03: Version 0.2.1
 - Create image - show wrong selected sub folder
 - Can't assign keymappping with 'Commands' (Closes: #1015)
diff --git a/menu.c b/menu.c
index 09a0ae2..010a491 100644
--- a/menu.c
+++ b/menu.c
@@ -740,9 +740,10 @@ eOSState cMainMenu::MenuMove(eKeys Key)
   SetHelp();
 
   mItem = (cMainMenuItem*)Get(Current());
-  MainMenuOptions.setLastSelectItemName(mItem->FileName());
-  MainMenuOptions.LastSelectItemType(mItem->Type());
-
+  if(mItem) {
+    MainMenuOptions.setLastSelectItemName(mItem->FileName());
+    MainMenuOptions.LastSelectItemType(mItem->Type());
+  }
   return state;
 }