Changeset 1043 for trunk

Timestamp:

01/15/11 21:41:21 (2 years ago)

Author:

reyalP

Message:

fix ptp script support/status commands with lua ifdefs from ultimA in ​http://chdk.setepontos.com/index.php?topic=5793.msg59721#msg59721

File:

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

trunk/core/ptp.c

@@ -128 +128 @@
     case PTP_CHDK_ScriptSupport:
       ptp.num_param = 1;
-      ptp.param1 = PTP_CHDK_SCRIPT_SUPPORT_LUA;
+      ptp.param1 = 0;
+#ifdef OPT_LUA
+      ptp.param1 |= PTP_CHDK_SCRIPT_SUPPORT_LUA;
+#endif
       break;
     case PTP_CHDK_ScriptStatus:
       ptp.num_param = 1;
 // TODO script_is_running should always be defined, just ret 0 if script disabled
+      ptp.param1 = 0;
 #ifdef OPT_SCRIPTING
-      ptp.param1 = script_is_running()?PTP_CHDK_SCRIPT_STATUS_RUN:0;
-#else
-      ptp.param1 = 0;
+      ptp.param1 |= script_is_running()?PTP_CHDK_SCRIPT_STATUS_RUN:0;
 #endif
       break;