Merge branch 'tracerestrict' into tracerestrict-sx

src/tracerestrict.cpp

@@ -1002,17 +1002,17 @@ CommandCost CmdProgramSignalTraceRestrictProgMgmt(TileIndex tile, DoCommandFlag
 	switch (type) {
 		case TRDCT_PROG_COPY: {
 			TraceRestrictRemoveProgramMapping(self);
-			TraceRestrictProgram *prog = GetTraceRestrictProgram(self, true);
-			if (!prog) {
-				// allocation failed
-				return CMD_ERROR;
-			}
 
 			TraceRestrictProgram *source_prog = GetTraceRestrictProgram(source, false);
-			if (source_prog) {
+			if (source_prog && !source_prog->items.empty()) {
+				TraceRestrictProgram *prog = GetTraceRestrictProgram(self, true);
+				if (!prog) {
+					// allocation failed
+					return CMD_ERROR;
+				}
 				prog->items = source_prog->items; // copy
+				prog->Validate();
 			}
-			prog->Validate();
 			break;
 		}
 

src/tracerestrict_gui.cpp

@@ -1645,6 +1645,9 @@ private:
 	 */
 	void SetObjectToPlaceAction(int widget, CursorID cursor)
 	{
+		if (this->current_placement_widget != -1 && widget != this->current_placement_widget) {
+			ResetObjectToPlace();
+		}
 		this->ToggleWidgetLoweredState(widget);
 		this->SetWidgetDirty(widget);
 		if (this->IsWidgetLowered(widget)) {