Merge pull request #5223 from larsbrubaker/main

Fixing issue with bed clearing
This commit is contained in:
Lars Brubaker 2022-02-18 18:12:14 -08:00 committed by GitHub
commit 3cc0f926a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View file

@ -1203,9 +1203,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.DragOperationActive = true;
// ContentStore is null for plated gcode, call ClearPlate to exit mode and return to bed mcx
if (sceneContext.Printer?.Bed?.LoadedGCode != null)
// Unsaved New Design also have a null ContentStore but they don't have gcode, so test both.
if (sceneContext.Printer?.Bed?.LoadedGCode != null
&& sceneContext.EditContext.ContentStore == null)
{
this.ClearPlate();
this.ClearPlate();
}
var firstItem = items.FirstOrDefault();

@ -1 +1 @@
Subproject commit 5abd087854acc3721d3c92ff8c83b97a89a96112
Subproject commit 2b6a245fdb71c94f2a0b82e99d0fd6ba2f3f1bfa