Changeset 1044

Timestamp:

01/15/11 22:11:51 (2 years ago)

Author:

reyalP

Message:

Improved error messages with script ifdefs, from ultimA in ​http://chdk.setepontos.com/index.php?topic=5793.msg59721#msg59721

File:

• trunk/core/script.c (modified) (5 diffs)

trunk/core/script.c

@@ -455 +455 @@
 }
 
-#ifdef OPT_LUA
 static int is_lua()
 {
@@ -467 +466 @@
     && s[len-4] == '.';
 }
-#endif
 
 static void wait_and_end(void)
@@ -630 +628 @@
         script_console_add_line(lang_str(LANG_CONSOLE_TEXT_STARTED));
 
+    if( is_lua() ) {
 #ifdef OPT_LUA
-    if( is_lua() ) {
         if( !lua_script_start(script_source_str) ) {
             script_print_screen_end();
@@ -646 +644 @@
         }
         state_lua_kbd_first_call_to_resume = 1;
+#else
+        console_add_line("Cannot run script.");
+        console_add_line("There is no Lua");
+        console_add_line("support in this build.");
+        return -1;
+#endif
     } else
-#endif
     { // ubasic
 #ifdef OPT_UBASIC
@@ -655 +658 @@
             ubasic_set_variable(i, conf.ubasic_vars[i]);
         }
+#else
+        console_add_line("Cannot run script.");
+        console_add_line("There is no UBasic");
+        console_add_line("support in this build.");
+        return -1;
 #endif
     }