diff --git a/ViewModel/Configuracion/DockpaneConfigViewModel.cs b/ViewModel/Configuracion/DockpaneConfigViewModel.cs index ebf32d7..c724f39 100644 --- a/ViewModel/Configuracion/DockpaneConfigViewModel.cs +++ b/ViewModel/Configuracion/DockpaneConfigViewModel.cs @@ -43,7 +43,10 @@ namespace OliviaAddInPro pane.Activate(); } - + protected override void OnHidden() + { + OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno); + } internal static void Hide_() { DockPane pane = FrameworkApplication.DockPaneManager.Find(_dockPaneID); @@ -64,7 +67,7 @@ namespace OliviaAddInPro if (isVisible == false && !firstTimeShow) { //avisa de cerrar la ventana - OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno); + //OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno); } if (firstTimeShow) firstTimeShow = false; diff --git a/ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs b/ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs index 477b626..31aa533 100644 --- a/ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs +++ b/ViewModel/Limpieza/DockpaneLimpiezaViewModel.cs @@ -50,7 +50,7 @@ namespace OliviaAddInPro DockPane pane = FrameworkApplication.DockPaneManager.Find(_dockPaneID); if (pane == null) return; - hideTemp = true; //avisa de que es manual, no por cierre del botón + hideTemp = true; //avisa de que solo esconde temporalmente, no para siempre pane.Hide(); } @@ -63,15 +63,13 @@ namespace OliviaAddInPro //The parameter passed to this method will be true if the Dockpane is being opened and it is false when you close the dockpane protected override void OnShow(bool isVisible) { - if (isVisible == false && !firstTimeShow && !hideTemp) - { - //avisa de cerrar la ventana - OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno); - } if (firstTimeShow) firstTimeShow = false; } - + protected override void OnHidden() + { + OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno); + } /// /// Text shown near the top of the DockPane. /// diff --git a/ViewModel/Recogida/DockpaneRecogidaViewModel.cs b/ViewModel/Recogida/DockpaneRecogidaViewModel.cs index 442a550..25e59c8 100644 --- a/ViewModel/Recogida/DockpaneRecogidaViewModel.cs +++ b/ViewModel/Recogida/DockpaneRecogidaViewModel.cs @@ -43,7 +43,10 @@ namespace OliviaAddInPro hideTemp = false; pane.Activate(); } - + protected override void OnHidden() + { + OliviaGlob.SetFlagTipEjec(TiposEjecucion.Ninguno); + } internal static void Hide_() { DockPane pane = FrameworkApplication.DockPaneManager.Find(_dockPaneID);