wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

partially revert static outputString in RenderCurrentFolder #477

Merged
stklcode merged 1 commits from fix/render-folder-regression into master 2023-06-25 09:53:56 -05:00
Conversation 0 Commits 1 Files Changed 1 +14 -12
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp
View File

@@ -874,21 +874,23 @@ void AnycubicTouchscreenClass::RenderCurrentFolder(uint16_t selectedNumber) {
SERIAL_ECHOLN(currentFileList.filename()); SERIAL_ECHOLN(currentFileList.filename());
#endif #endif
const char* fileName = currentFileList.filename(); const char* fileName = currentFileList.filename();
unsigned int fileNameLen = strlen(fileName); unsigned int fileNameLen = strlen(fileName);
// Cut off too long filenames. // Cut off too long filenames.
// They don't fit on the screen anyway. // They don't fit on the screen anyway.
#if ENABLED(KNUTWURST_DGUS2_TFT) #if ENABLED(KNUTWURST_DGUS2_TFT)
bool fileNameWasCut = false; bool fileNameWasCut = false;
if (fileNameLen >= MAX_PRINTABLE_FILENAME_LEN) { if (fileNameLen >= MAX_PRINTABLE_FILENAME_LEN) {
fileNameWasCut = true; fileNameWasCut = true;
fileNameLen = MAX_PRINTABLE_FILENAME_LEN; fileNameLen = MAX_PRINTABLE_FILENAME_LEN;
} }
#endif static char outputString[MAX_PRINTABLE_FILENAME_LEN];
#else
char outputString[fileNameLen];
#endif
// Bugfix for non-printable special characters which are now replaced by underscores. // Bugfix for non-printable special characters which are now replaced by underscores.
static char outputString[MAX_PRINTABLE_FILENAME_LEN] = {'\0'};
for (unsigned int i = 0; i <= fileNameLen; i++) { for (unsigned int i = 0; i <= fileNameLen; i++) {
if (isPrintable(fileName[i])) { if (isPrintable(fileName[i])) {
outputString[i] = fileName[i]; outputString[i] = fileName[i];
@@ -929,7 +931,7 @@ void AnycubicTouchscreenClass::RenderCurrentFolder(uint16_t selectedNumber) {
outputString[MAX_PRINTABLE_FILENAME_LEN] = '\0'; outputString[MAX_PRINTABLE_FILENAME_LEN] = '\0';
} }
#else #else
outputString[fileNameLen] = '\0'; outputString[fileNameLen] = '\0';
#endif #endif