Merge remote-tracking branch 'upstream/master'

src/object_gui.cpp

@@ -443,6 +443,8 @@ public:
 
 		if (_selected_object_index != -1) {
 			SetObjectToPlaceWnd(SPR_CURSOR_TRANSMITTER, PAL_NONE, HT_RECT | HT_DIAGONAL, this, DDSP_BUILD_OBJECT);
+		} else {
+			ResetObjectToPlace();
 		}
 
 		this->UpdateButtons(_selected_object_class, _selected_object_index, _selected_object_view);