Merge remote-tracking branch 'upstream/master'

diabase · Dec 16, 2020 · 744fd64 · 744fd64
2 parents 781ec1a + ac86003
commit 744fd64
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/PanelDue.cpp b/src/PanelDue.cpp
@@ -1731,7 +1731,7 @@ void ProcessReceivedValue(StringRef id, const char data[], const size_t indices[
 
 	case rcvJobLastFileName:
 		ShowLine;
-		UI::LastJobFileNameAvailable(data != 0);
+		UI::LastJobFileNameAvailable(true);	// If we get here there is a filename
 		break;
 
 	case rcvJobLastFileSimulated:
@@ -2067,6 +2067,7 @@ void ProcessReceivedValue(StringRef id, const char data[], const size_t indices[
 					seqs.Reset();
 					Reconnect();
 					UI::ResetBedsAndChambers();
+					UI::LastJobFileNameAvailable(false);
 				}
 				remoteUpTime = uival;
 			}

diff --git a/src/UserInterface.cpp b/src/UserInterface.cpp
@@ -3649,7 +3649,7 @@ namespace UI
 			case evResimulate:
 				if (lastJobFileNameAvailable)
 				{
-					SerialIo::Sendf("%s {job.lastFileName}\n", (ev == evResimulate) ? "M37 P" : "M32 ");
+					SerialIo::Sendf("%s{job.lastFileName}\n", (ev == evResimulate) ? "M37 P" : "M32 ");
 					CurrentButtonReleased();
 					PrintStarted();
 				}

diff --git a/src/Version.hpp b/src/Version.hpp
@@ -8,7 +8,7 @@
 #ifndef SRC_VERSION_HPP_
 #define SRC_VERSION_HPP_
 
-#define VERSION_TEXT_MAIN		"3.2.6"
+#define VERSION_TEXT_MAIN		"3.2.6+1"
 
 #ifdef SUPPORT_ENCODER
 #define VERSION_TEXT	VERSION_TEXT_MAIN "+enc"

diff --git a/whatsnew.md b/whatsnew.md
@@ -17,6 +17,8 @@
 ## Bug fixes:
 * Fix memory leaks
 * Show fan value of current tool instead of hard-coded fan with number 0
+* Fix reprint/resimulate button not sending the correct command (3.2.6+1)
+* Fix reprint/resimulate button not hiding when mainboard restarts (3.2.6+1)
 
 
 # Version 3.2.5