2 files changed, 18 insertions, 1 deletions

diff --git a/apps/plugins/lua/lua.make b/apps/plugins/lua/lua.make
index c85182880b..a5d1813a8b 100644
--- a/apps/plugins/lua/lua.make
+++ b/apps/plugins/lua/lua.make
@@ -40,7 +40,7 @@ $(LUA_BUILDDIR)/settings.lua: $(LUA_OBJ) $(LUA_SRCDIR)/settings_helper.pl
 
 HOST_INCLUDES := $(filter-out %/libc/include,$(INCLUDES))
 $(LUA_BUILDDIR)/buttons.lua: $(LUA_OBJ) $(LUA_SRCDIR)/button_helper.pl
-        $(SILENT)$(CC) $(INCLUDES) $(TARGET) $(CFLAGS) -dM -E -P -include button-target.h - < /dev/null | $(LUA_SRCDIR)/button_helper.pl | $(HOSTCC) $(TARGET) -fno-builtin $(HOST_INCLUDES) -x c -o $(LUA_BUILDDIR)/button_helper -
+        $(SILENT)$(CC) $(INCLUDES) $(TARGET) $(CFLAGS) -dM -E -P -include button-target.h - < /dev/null | $(LUA_SRCDIR)/button_helper.pl | $(HOSTCC) $(TARGET) -fno-builtin $(HOST_INCLUDES) $(EXTRA_DEFINES) -x c -o $(LUA_BUILDDIR)/button_helper -
         $(call PRINTS,GEN $(@F))$(LUA_BUILDDIR)/button_helper > $(LUA_BUILDDIR)/buttons.lua
 
 $(LUA_BUILDDIR)/rb_defines.lua: $(LUA_OBJ) $(LUA_SRCDIR)/rbdefines_helper.pl
diff --git a/apps/plugins/lua/rocklua.c b/apps/plugins/lua/rocklua.c
index 3cf0fce945..650c4d6dae 100644
--- a/apps/plugins/lua/rocklua.c
+++ b/apps/plugins/lua/rocklua.c
@@ -241,6 +241,20 @@ static void display_traceback(const char *errstr)
   rb->splash(10 * HZ, errstr);
 #endif
 }
+
+int browse_scripts(void)
+{
+    static char buf[MAX_PATH];
+    const char *fname = rb->plugin_get_current_filename();
+    /* strip plugin dir to save space in the param buffer */
+    if (rb->strncmp(fname, PLUGIN_DIR, sizeof(PLUGIN_DIR) - 1) == 0)
+        fname += sizeof(PLUGIN_DIR) - 1; /* leave slash */
+    /* -r return to this plugin, -f looking for lua files,
+       -s start in lua_scripts, -d lock to that directory */
+    snprintf(buf, sizeof(buf), "-r'%s'-f'.lua'-s'%s'-d",
+             fname, PLUGIN_DEMOS_DIR"/lua_scripts/");
+    return rb->plugin_open(VIEWERS_DIR "/file_picker.rock", buf);
+}
 /***************** Plugin Entry Point *****************/
 enum plugin_status plugin_start(const void* parameter)
 {
@@ -249,7 +263,10 @@ enum plugin_status plugin_start(const void* parameter)
     if (parameter == NULL)
     {
       if (!Ls)
+      {
         rb->splash(HZ, "Play a .lua file!");
+        return browse_scripts();
+      }
     }
     else
     {