multistep find and deliver + details on error detection

jarig · Feb 1, 2016 · bbdd00b · bbdd00b
1 parent 1a6fade
commit bbdd00b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/EliteReporter/Assets/mTypes/MultiStepFindAndDeliver.bmp b/EliteReporter/Assets/mTypes/MultiStepFindAndDeliver.bmp
diff --git a/EliteReporter/EliteReporter.csproj b/EliteReporter/EliteReporter.csproj
@@ -347,6 +347,9 @@
     <Content Include="Assets\mTypes\MultiStepCourierDelivery.bmp">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Assets\mTypes\MultiStepFindAndDeliver.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Assets\mTypes\PirateCargo.bmp">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

diff --git a/EliteReporter/Forms/ReportForm.cs b/EliteReporter/Forms/ReportForm.cs
@@ -47,7 +47,12 @@ private void RegisterMission(object source, FileSystemEventArgs e)
         {
             Trace.TraceInformation("File: " + e.FullPath + " " + e.ChangeType);
             Thread.Sleep(500); // wait until file is ready
-            analyzeScreenShot(e.FullPath);
+            try {
+                analyzeScreenShot(e.FullPath);
+            }catch (Exception ex)
+            {
+                toolStripStatusLabel1.Text = "Error during screen analysis: " + ex.Message;
+            }
         }
 
         private void analyzeScreenShot(string pathToBmp)
@@ -73,13 +78,13 @@ private void analyzeScreenShot(string pathToBmp)
                 if (existingLvItem != null)
                 {
                     //finshing mission
-                    if (((MissionInfo)existingLvItem.Tag).MissionTakenDateTime.Value.Add(takenMisisonCoolDown) < DateTime.UtcNow)
+                    if (((MissionInfo)existingLvItem.Tag).MissionTakenDateTime.Value.Add(takenMisisonCoolDown) < DateTime.Now)
                     {
                         var edProfile = edapi.getProfile();
                         var missionInfo = (MissionInfo)existingLvItem.Tag;
                         if (missionInfo.MissionFinishedEDProfile == null)
                         {
-                            missionInfo.MissionFinishedDateTime = DateTime.UtcNow;
+                            missionInfo.MissionFinishedDateTime = DateTime.Now;
                             missionInfo.MissionFinishedEDProfile = edProfile;
                             fillMissionListViewItem(existingLvItem, missionInfo);
                         }
@@ -96,7 +101,7 @@ private void analyzeScreenShot(string pathToBmp)
                     var edProfile = edapi.getProfile();
                     if (string.IsNullOrEmpty(commanderName))
                         commanderName = edProfile.CommanderName;
-                    result.MissionTakenDateTime = DateTime.UtcNow;
+                    result.MissionTakenDateTime = DateTime.Now;
                     result.MissionTakenEDProfile = edProfile;
                     ListViewItem lvItem = new ListViewItem();
                     lvItem.Tag = result;