Merge branch 'master' into jgrpp

# Conflicts:
#	src/vehicle.cpp

src/newgrf_debug_gui.cpp

@@ -1519,6 +1519,9 @@ struct SpriteAlignerWindow : Window {
 			}
 
 			case WID_SA_LIST: {
+				/* Don't redraw sprite list while it is still being filled by picker. */
+				if (_newgrf_debug_sprite_picker.mode == SPM_REDRAW) break;
+
 				const NWidgetBase *nwid = this->GetWidget<NWidgetBase>(widget);
 				int step_size = nwid->resize_y;