From ddfeb79d17e33256c8b710f0ca2fbff78097c3c6 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 14 Nov 2017 15:47:45 -0800 Subject: [PATCH] Interactive save shouldn't be more encumbered than auto save - Don't prompt for Save location if we're already auto saving to default locations in other contexts --- PartPreviewWindow/View3D/View3DWidget.cs | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index bc59532ad..5582d00e1 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -343,14 +343,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow Title = "Save".Localize(), Action = async () => { - if (sceneContext.printItem == null) - { - UiThread.RunOnIdle(OpenSaveAsWindow); - } - else - { - await this.SaveChanges(); - } + await this.SaveChanges(); } }, new NamedAction() @@ -2017,16 +2010,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow try { - // Force to .mcx - if (Path.GetExtension(sceneContext.printItem.FileLocation) != ".mcx") - { - sceneContext.printItem.FileLocation = Path.ChangeExtension(sceneContext.printItem.FileLocation, ".mcx"); - } - - // TODO: Hook up progress reporting - Scene.Save(sceneContext.printItem.FileLocation, ApplicationDataStorage.Instance.ApplicationLibraryDataPath); - - sceneContext.printItem.PrintItem.Commit(); + sceneContext.Save(); } catch (Exception ex) {