Ticket #2170: exit_with_left_key_from_video_listing_like_from_recording_listing.diff

mythvideo/mythvideo/videotree.cpp

@@ -17 +17 @@
 
 #include "videofilter.h"
 #include "videolist.h"
+
 const long WATCHED_WATERMARK = 10000; // Less than this and the chain of videos will 
                                       // not be followed when playing.
 
@@ -84 +85 @@
             video_tree_list->moveUp();
         else if (action == "DOWN")
             video_tree_list->moveDown();
-        else if (action == "LEFT")
-            video_tree_list->popUp();
+        else if (action == "LEFT") 
+        {
+            if (video_tree_list->getCurrentNode()->getParent() != video_tree_root) 
+            {
+                video_tree_list->popUp();
+            } else
+            {
+                // if we are at root, exit from the dialog, to make
+                // the behavior similar to the recorded shows dialog
+                done(1);
+            }
+        }
         else if (action == "RIGHT")
             video_tree_list->pushDown();
         else if (action == "PAGEUP")
@@ -109 +120 @@
             handled = false;
     }
 
-        if (!handled)
+    if (!handled)
     {
     
-    gContext->GetMainWindow()->TranslateKeyPress("TV Frontend", e, actions);
+        gContext->GetMainWindow()->TranslateKeyPress("TV Frontend", e, actions);
 
         for (unsigned int i = 0; i < actions.size() && !handled; i++)
         {
@@ -125 +136 @@
         }            
     }
 
-    
     if (!handled) 
         MythThemedDialog::keyPressEvent(e);
 }
@@ -241 +251 @@
     int file_browser = gContext->GetNumSetting("VideoTreeNoDB", 0);
 
     video_tree_root = video_list->buildVideoList(file_browser, false,
-                                                current_parental_level);
+                                                 current_parental_level);
     if (video_tree_root->childCount() > 0)
         video_tree_data = video_tree_root->getChildAt(0,0);
     else video_tree_data = video_tree_root;