Commit 5edd958 1 parent dfca3b4 commit 5edd958 Copy full SHA for 5edd958
File tree 2 files changed +3
-3
lines changed
Marlin/src/lcd/extui/ftdi_eve_touch_ui
ftdi_eve_lib/extended/unicode
2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change 68
68
69
69
utf8_char_t FTDI::get_utf8_char_and_inc (const char *&c) {
70
70
utf8_char_t val = *(uint8_t *)c++;
71
- if ((val & 0xC0 ) == 0x80 )
71
+ if ((val & 0xC0 ) == 0xC0 )
72
72
while ((*c & 0xC0 ) == 0x80 )
73
73
val = (val << 8 ) | *(uint8_t *)c++;
74
74
return val;
75
75
}
76
76
77
77
utf8_char_t FTDI::get_utf8_char_and_inc (char *&c) {
78
78
utf8_char_t val = *(uint8_t *)c++;
79
- if ((val & 0xC0 ) == 0x80 )
79
+ if ((val & 0xC0 ) == 0xC0 )
80
80
while ((*c & 0xC0 ) == 0x80 )
81
81
val = (val << 8 ) | *(uint8_t *)c++;
82
82
return val;
Original file line number Diff line number Diff line change @@ -49,6 +49,7 @@ void SpinnerDialogBox::show(progmem_str message) {
49
49
void SpinnerDialogBox::hide () {
50
50
CommandProcessor cmd;
51
51
cmd.stop ().execute ();
52
+ GOTO_PREVIOUS ();
52
53
}
53
54
54
55
void SpinnerDialogBox::enqueueAndWait (progmem_str message, progmem_str commands) {
@@ -66,7 +67,6 @@ void SpinnerDialogBox::onIdle() {
66
67
if (mydata.auto_hide && !commandsInQueue ()) {
67
68
mydata.auto_hide = false ;
68
69
hide ();
69
- GOTO_PREVIOUS ();
70
70
}
71
71
}
72
72
You can’t perform that action at this time.
0 commit comments