Skip to content

Commit 5926e39

Browse files
committed
Automatic merge of T1.5.1-1080-g433d161cdb and 20 pull requests
- Pull request #891 at 9a1d6b2: Auto save - Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #882 at 8f695a4: Blueprint/train car operations UI window - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #922 at a3bc9e7: Autopilot for timetable mode - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #962 at 46d0472: Fix pantographs on unpowered cars - Pull request #965 at 4725f3d: style: Renormalize line endings - Pull request #969 at 9d53199: Bugfix refocus to the main window when opening the map window - Pull request #970 at 6fa5eed: feat: Remove unnecessary Windows.Forms usage - Pull request #900 at c27f32d: DMI updates - Pull request #799 at dfc715e: Consolidated wind simulation - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #885 at e267870: feat: Add notifications to Menu - Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains - Pull request #946 at 91a03af: Advanced track sounds - Pull request #952 at 8347095: Investigation - Pulsing graphics - Pull request #954 at f837ffd: Multiple Track Profiles & Superelevation Improvements - Pull request #968 at 5310029: Initial build of adding track section identifier for rack railway
22 parents b4af244 + 433d161 + 9a1d6b2 + 2452cb0 + d00beb9 + 8f695a4 + 1f5ba4c + a3bc9e7 + a519452 + 46d0472 + 4725f3d + 9d53199 + 6fa5eed + c27f32d + dfc715e + f92de76 + e267870 + 5866028 + 91a03af + 8347095 + f837ffd + 5310029 commit 5926e39

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Source/RunActivity/Viewer3D/Map/MapForm.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,11 @@ private void InitializeData()
364364
var maxsize = maxX - minX > maxY - minY ? maxX - minX : maxY - minY;
365365
// Take up to next 500
366366
maxsize = (int)((maxsize / 100) + 1) * 500;
367-
mapResolutionUpDown.Maximum = (decimal)maxsize;
367+
if ((decimal)maxsize < mapResolutionUpDown.Maximum)
368+
{
369+
// do not make maximum larger then the maximum defined in the Designer
370+
mapResolutionUpDown.Maximum = (decimal)maxsize;
371+
}
368372
Inited = true;
369373

370374
if (simulator.TDB == null || simulator.TDB.TrackDB == null || simulator.TDB.TrackDB.TrItemTable == null)

0 commit comments

Comments
 (0)