Changeset 186 for trunk/core/script.c

Timestamp:

12/06/09 12:59:50 (3 years ago)

Author:

CHDKLover

Message:

Konsolen-Speicher beim laden von Skripten freigeben

File:

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

trunk/core/script.c

@@ -17 +17 @@
 char cfg_name[100] = "\0";
 char cfg_set_name[100] = "\0";
-int script_console_num_lines, script_console_line_length, script_console_x, script_console_y, auto_redraw=1;
+int script_console_num_lines=0, script_console_line_length=0, script_console_x=0, script_console_y=0, auto_redraw=1;
 
 static const char *ubasic_script_default =
@@ -75 +75 @@
 static char script_params_update[SCRIPT_NUM_PARAMS];
 static int script_loaded_params[SCRIPT_NUM_PARAMS];
-//static char script_console_buf[script_console_num_lines][script_console_line_length+1];
-static char **script_console_buf;
+static char **script_console_buf=NULL;
 static int script_con_start_line=0; // oldest valid line in console
 static int script_con_num_lines=0; // number of valid lines
@@ -313 +312 @@
         ufree(buf);
 }
-
-
-
+//-------------------------------------------------------------------
+void script_console_buf_free(){
+  int i;
+  if(script_console_buf){
+    //Speicher freigeben
+    for(i=0;i<script_console_num_lines;i++) {
+      free(script_console_buf[i]);
+    }
+    free(script_console_buf);
+    script_console_buf=NULL;
+  }
+}
 //-------------------------------------------------------------------
 void script_load(const char *fn, int saved_params) {
@@ -322 +330 @@
     struct stat st;
     
+    script_console_buf_free();
     auto_redraw=1;
     script_console_num_lines=5;
@@ -545 +554 @@
       }
       //Speicher freigeben
-      for(i=0;i<script_console_num_lines;i++) {
-        free(script_console_buf[i]);
-      }
-      free(script_console_buf);
+      script_console_buf_free();
       //neue Werte setzten
       script_console_buf=tmp;