Merge branch 'Development' into config_testing

Latest upstream changes
2015-03-20 04:15:18 -07:00
parent a1c240b0a4 526a755a66
commit 63d5d28085
15 changed files with 59 additions and 19 deletions
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@ -2514,13 +2514,13 @@ inline void gcode_M17() {
   */
  inline void gcode_M28() {
    char* codepos = strchr_pointer + 4;
-    char* starpos = strchr(strchr_pointer + 4, '*');
+    char* starpos = strchr(codepos, '*');
    if (starpos) {
      char* npos = strchr(cmdbuffer[bufindr], 'N');
      strchr_pointer = strchr(npos, ' ') + 1;
      *(starpos) = '\0';
    }
-    card.openFile(strchr_pointer + 4, false);
+    card.openFile(codepos, false);
  }

  /**