Changeset 1405

Timestamp:

11/10/11 20:32:57 (20 months ago)

Author:

philmoz

Message:

Fix for file select / text reader bug from tsvstar:
​http://chdk.setepontos.com/index.php?topic=650.msg75640#msg75640

File:

• trunk/core/gui_fselect.c (modified) (4 diffs)

trunk/core/gui_fselect.c

@@ -986 +986 @@
 
 //-------------------------------------------------------------------
-static void exit_fselect()
+static void exit_fselect(char* file)
 {
     gui_fselect_free_data();
@@ -997 +997 @@
     if (fselect_on_select) 
     {
-        fselect_on_select(selected_file);
+        fselect_on_select(file);
     }
     if (!set_key_redraw_mode)
@@ -1083 +1083 @@
                 } else  {
                     sprintf(selected_file, "%s/%s", current_dir, selected->name);
-                    exit_fselect();
+                    exit_fselect(selected_file);
                 }
             }
@@ -1104 +1104 @@
             break;
         case KEY_MENU:
-            exit_fselect();
-            break;
-    }
-}
-
-//-------------------------------------------------------------------
+            // just free resource. callback called with NULL ptr
+            exit_fselect(0);
+            break;
+    }
+}
+
+//-------------------------------------------------------------------