Changeset 1461

Timestamp:

12/09/11 20:52:48 (18 months ago)

Author:

philmoz

Message:

Fix for problem when using the file selector from a script. If the shutter button is pressed when the file selector is open the script is cancelled; but leaves CHDK in a strange state where <ALT> mode buttons do not work correctly.
This change blocks the shutter button press from starting/stopping a script if the file selector is open.
​http://chdk.setepontos.com/index.php?topic=7227.msg77603#msg77603

File:

• trunk/core/kbd.c (modified) (1 diff)

trunk/core/kbd.c

@@ -264 +264 @@
 /*-------------------- Alex scriptless remote additions end ---------------------*/
 #ifdef OPT_SCRIPTING
-        if (kbd_is_key_pressed(KEY_SHOOT_FULL)) {
+                // Start or stop a script if the shutter button pressed
+                // Note: this is blocked if CHDK is in the file selector. prevents problems
+                //       when the file selector is called from a script.
+        if (kbd_is_key_pressed(KEY_SHOOT_FULL) && (gui_get_mode() != GUI_MODE_FSELECT)) {
             key_pressed = 100;
             if (!state_kbd_script_run) {