nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent unexpected ActivePrinter changes

Browse source 
- Prevent selection changes on "Add New Printer..." menu item
- Prevent ActivePrinterChanged on differing EmptyProfile instances
- Prevent calling SwitchToProfile on PrinterSelector change if already
  on instance
This commit is contained in:
John Lewin 2016-12-10 14:39:15 -08:00
parent 105d9fcab2
commit ff2f7d249e
3 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

37
ActionBar/PrinterSelector.cs
View file

@ -58,7 +58,9 @@ namespace MatterHackers.MatterControl
this.SelectionChanged += (s, e) =>
{
string printerID = this.SelectedValue;
if (printerID == "new" || string.IsNullOrEmpty(printerID))
if (printerID == "new"
|| string.IsNullOrEmpty(printerID)
|| printerID == ActiveSliceSettings.Instance.ID)
{
// do nothing
}
@ -106,28 +108,25 @@ namespace MatterHackers.MatterControl
this.mainControlText.Text = ActiveSliceSettings.Instance.GetValue(SettingsKey.printer_name);
}
this.AddItem(
StaticData.Instance.LoadIcon("icon_plus.png", 32, 32),
"Add New Printer...",
"new").Click += (s, e) =>
var menuItem = this.AddItem(StaticData.Instance.LoadIcon("icon_plus.png", 32, 32), "Add New Printer...", "new");
menuItem.Selectable = false;
menuItem.Click += (s, e) =>
{
if (AddPrinter != null)
{
if (AddPrinter != null)
if (PrinterConnectionAndCommunication.Instance.PrinterIsPrinting
|| PrinterConnectionAndCommunication.Instance.PrinterIsPaused)
{
if (PrinterConnectionAndCommunication.Instance.PrinterIsPrinting
|| PrinterConnectionAndCommunication.Instance.PrinterIsPaused)
{
UiThread.RunOnIdle(() =>
UiThread.RunOnIdle(() =>
StyledMessageBox.ShowMessageBox(null, "Please wait until the print has finished and try again.".Localize(), "Can't add printers while printing".Localize())
);
this.SelectedIndex = lastSelectedIndex;
}
else
{
this.SelectedIndex = lastSelectedIndex;
UiThread.RunOnIdle(() => AddPrinter(this, null));
}
);
}
};
else
{
UiThread.RunOnIdle(() => AddPrinter(this, null));
}
}
};
}
private void SettingChanged(object sender, EventArgs e)

4
SlicerConfiguration/Settings/ActiveSliceSettings.cs
View file

@ -60,7 +60,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
set
{
if (activeInstance != value)
// EmptyProfile instances may differ but IDs are always be the same. Only process if instance and IDs differ
if (activeInstance != value
&& activeInstance?.ID != value.ID)
{
// If we have an active printer, run Disable otherwise skip to prevent empty ActiveSliceSettings due to null ActivePrinter
if (activeInstance != null)

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit edeac9f39b0bb611b2e809116ebbf1399ce96983
Subproject commit a4a07ad3397766f5c67cf5f53bc5ea5ecd479150