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

Revise close on printer change logic

Browse source 
- Issue MatterHackers/MCCentral#4305
Multiple printer tabs appear
This commit is contained in:
John Lewin 2018-10-18 16:25:35 -07:00
parent 5ca295385e
commit 4abc1de7c6
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
MatterControlLib/PartPreviewWindow/PartPreviewContent.cs
View file

@ -328,21 +328,20 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
var activePrinter = ApplicationController.Instance.ActivePrinter;
// If ActivePrinter has been nulled and a printer tab is open, close it
var tab1 = tabControl.AllTabs.FirstOrDefault(t => t.TabContent is PrinterTabPage);
if ((activePrinter == null || !activePrinter.Settings.PrinterSelected)
&& tab1 != null)
// Close existing printer tabs
if (tabControl.AllTabs.FirstOrDefault(t => t.TabContent is PrinterTabPage) is ITab tab
&& tab.TabContent is PrinterTabPage printerPage
&& (activePrinter == null || printerPage.printer != activePrinter))
{
tabControl.RemoveTab(tab1);
tabControl.RemoveTab(tab);
}
else
if (activePrinter.Settings.PrinterSelected)
{
if (activePrinter.Settings.PrinterSelected)
{
// Create and switch to new printer tab
tabControl.ActiveTab = this.CreatePrinterTab(activePrinter, theme);
}
// Create and switch to new printer tab
tabControl.ActiveTab = this.CreatePrinterTab(activePrinter, theme);
}
tabControl.RefreshTabPointers();
}, ref unregisterEvents);