Context Navigation

HiveTasks

Timestamp:

03/28/12 15:47:26 (13 years ago)

Author:

spimming

Message:

#1680: merged changes from trunk into branch

Location:

branches/HeuristicLab.Hive.Azure

Files:

Property svn:ignore

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

Property svn:mergeinfo changed

r7270	r7669
207	207
208	208	private void priorityComboBox_SelectedIndexChanged(object sender, EventArgs e) {
209		if (Content.Task.Priority != priorityComboBox.SelectedIndex) {
	209	if (Content != null && Content.Task != null && Content.Task.Priority != priorityComboBox.SelectedIndex) {
210	210	Content.Task.Priority = priorityComboBox.SelectedIndex;
211	211	}

-                      r7270
+                      r7669
 using System;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
 using System.Threading.Tasks;
+using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.PluginInfrastructure;
 …
         FinishProgressView();
         ErrorHandling.ShowErrorDialog(this, "An error occured while resuming the task.", t.Exception);
       }, TaskContinuationOptions.OnlyOnFaulted);
+      }, TaskContinuationOptions.OnlyOnFaulted);
+    }

Note: See TracChangeset for help on using the changeset viewer.