From 53661c5dea919455d8fdf674e81808ebd0949c8c Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Sat, 31 May 2014 14:52:27 +0200
Subject: [PATCH] Avoid global info_selection_ptr.

Don't reset selection_ptr after info screen.
---
 frontend/menu/backend/menu_common_backend.c | 8 +++-----
 frontend/menu/menu_common.h                 | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index af9a9ded93..c1dd9dfc24 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -43,8 +43,6 @@
 #endif
 #endif
 
-static unsigned info_selection_ptr = 0;
-
 #ifdef HAVE_SHADER_MANAGER
 static inline struct gfx_shader *shader_manager_get_current_shader(void *data, unsigned type)
 {
@@ -502,7 +500,7 @@ static int menu_info_screen_iterate(unsigned action)
       }
    }
 
-   switch(info_selection_ptr)
+   switch (rgui->info_selection)
    {
       case RGUI_SETTINGS_WINDOW_COMPOSITING_ENABLE:
          snprintf(msg, sizeof(msg),
@@ -1276,8 +1274,8 @@ static int menu_settings_iterate(unsigned action)
       case RGUI_ACTION_SELECT:
          {
             const char *path = NULL;
-            file_list_get_at_offset(rgui->selection_buf, rgui->selection_ptr, &path, &info_selection_ptr);
-            file_list_push(rgui->menu_stack, "", RGUI_INFO_SCREEN, 0);
+            file_list_get_at_offset(rgui->selection_buf, rgui->selection_ptr, &path, &rgui->info_selection);
+            file_list_push(rgui->menu_stack, "", RGUI_INFO_SCREEN, rgui->selection_ptr);
          }
          break;
       case RGUI_ACTION_LEFT:
diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index f800437364..f4e5ce5c43 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -140,6 +140,7 @@ typedef struct
    file_list_t *menu_stack;
    file_list_t *selection_buf;
    size_t selection_ptr;
+   unsigned info_selection;
    bool need_refresh;
    bool msg_force;
    bool push_start_screen;