Changeset 7460 for branches/HeuristicLab.TimeSeries/HeuristicLab.Optimizer

Timestamp:

02/06/12 17:50:17 (13 years ago)

Author:

gkronber

Message:

#1081: merged r7266:7459 from the trunk into the time series prognosis branch.

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (2 props)
• HeuristicLab.Optimizer/3.3/Documents/IslandGA_TSP.hl (modified) (previous)
• HeuristicLab.Optimizer/3.3/MenuItems/CloseMenuItem.cs (modified) (1 diff)

branches/HeuristicLab.TimeSeries

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user

branches/HeuristicLab.TimeSeries/HeuristicLab.Optimizer/3.3/MenuItems/CloseMenuItem.cs

@@ -42 +42 @@
 
     protected override void OnToolStripItemSet(EventArgs e) {
-      ToolStripItem.Enabled = !(MainFormManager.MainForm.ActiveView is Sidebar);
+      ToolStripItem.Enabled = (MainFormManager.MainForm.ActiveView != null) && !(MainFormManager.MainForm.ActiveView is Sidebar);
     }
     protected override void OnActiveViewChanged(object sender, EventArgs e) {
-      ToolStripItem.Enabled = !(MainFormManager.MainForm.ActiveView is Sidebar);
+      ToolStripItem.Enabled = (MainFormManager.MainForm.ActiveView != null) && !(MainFormManager.MainForm.ActiveView is Sidebar);
     }
 

@@ -3 +3 @@
 *.resharper
 *.suo
+*.user
 *.vsp
 Doxygen
+FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
 HeuristicLab 3.3.5.1.ReSharper.user