From bbdd00bd17a608a70cdac273641e3bfdba22fcae Mon Sep 17 00:00:00 2001
From: jarig <jarig@users.noreply.github.com>
Date: Mon, 1 Feb 2016 23:09:45 +0200
Subject: [PATCH] multistep find and deliver + details on error detection

---
 .../Assets/mTypes/MultiStepFindAndDeliver.bmp    | Bin 0 -> 8322 bytes
 EliteReporter/EliteReporter.csproj               |   3 +++
 EliteReporter/Forms/ReportForm.cs                |  13 +++++++++----
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 EliteReporter/Assets/mTypes/MultiStepFindAndDeliver.bmp

diff --git a/EliteReporter/Assets/mTypes/MultiStepFindAndDeliver.bmp b/EliteReporter/Assets/mTypes/MultiStepFindAndDeliver.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..1cd543a830bd4d6a0311319d997f35e2191b2a6a
GIT binary patch
literal 8322
zcmai&S#%rMea77f0)tsFg8@K*#5P!F08m`OeFJ4#mMLnXWQ!odos`5~BB{l)RLOBq
zTOYTlJ?TlB*mY0rT1lL`*}No<YbQ;d2j?LVwG*dlA7nd@8z*^ka-5Uced~AcodIS5
z+V=T){hy1`!H?g6xmP+k{#V*<^uIo=IsEkCrx!nec3T+hZMPlQ=>Hsx+oQNRuZxor
zcz7Q#_ysZG5&XR9_Xw&}*nt9qw~<H+nqrT1<pjT_04JE@y<tH%#Y<t{+a$<MoY2UL
zjR*v}89Q{d88MSc1Gh)!MK#bEYYfL5!--H6q#+1~;#8G@K9U!bP>{Sp6tF}d!x|I_
z5e4lE<NZCAYHUhF!ElNy-55qpb|fX@5yP-6W3-+=vsRv7n4%&<d46(guH@8Yc^)s6
zXBMZX7fa>&(v)2brKyF<GPGz{sk~4kJLW##v9ws4Vs9=@mX{DSA%^A`*R*syWm7Xo
z+v?i6eQiBPt|OZ-KnV0~d&VgvU&!t2%C&Uq*^Z1;dbXhF3g(*Y)NL~IU67vb(sM+a
zELE<X?HDY;r<Mv`#Zq}Gnd$IIO>Q1+?JKKWY9Pw-Dv{vFrpx1V3i|<GYQ);WsSTWu
zt_biZ<hLo{@|be-!Ajh~;SW~S=<)>JJXvcLO|(o*Ei$$SPJurwYv%}?RmpB1-^K9Q
zSF0W|D9T~5fuTah0_?bX0@J|ZBfGE(0P^jia-)8Pu$vFL`7kFnxey2;4m;SFny|x(
zMDbMnWcf@w*CY7iRkk45%+9jdOfY=4;0=kSx$s4HHv9@zmuz6fA7TgvV{F7UK$6Wy
z2w+&*j<t!MP&Bb`ViGwmc%)`z$Mh{2t79`WB`M8bUxb%J6s+nDz+ekYoGo7_7*fWv
zRsmoEkT~KYV*?%$sF)a=M%W^RE!RPEYO)1k4$Tn(!!#H<aQM*ZIQkm<4YtJLF&xn$
zOsc9gw4yM?Ld|+GoZ(6Cs^)+}kR#z}wmFtZ`T)bg8ayVLiw{Q=t?&(OoET~FsCt!+
zfZ5p&9y<2(pa0LTTW@xD7imRRiaFp5#E*?njvbwllxWp7THC=Uee76i{~gEFVA3+p
z^rtDB8#^|6>_k~qVj!V-AOss?BFeU`WjZ}l6g5xT&a1&V1GBRM>DlL=f9Bb5XN&@2
zBfgo!cpTn;cyRa-%&`E>a`FX}LnEVIz58V~4&SIuX98h;X#d#Afup=PQsHs3wM|Se
zCo^3ZTVZ9bhRy7KoE_PGH|7=6RO1`+sQBZuieI07dv!%QDFMx^CJ<B#34vR{*%VcS
zX<smf*kZE>P0<8p(;1r|W7Elo8aCO$QxSCx)4&pII@))vur0_+@z?_te-p%s&5(@>
zU=BsK_KB&}n%>1pF%-Ow4WpH)j*ZMHQt)*G4;fRm?<k>Z6d7fv2ojnONNh#m7J%nK
za$$$c#)f*Uuq7Cnlg*@JY&Cc`Fh}la9!X&{fvvmm4pbWNjiHJFM%Wmhg+#$3SS_}0
z>RSNigq->UcD6lE6Oc4i2LkCk>KHshnqZE@D3(FC!mjzHjgzMqLXkXUgK2It0x_>#
zG^US{sMbMq3br`PiLz~5Y&b`7tk~FWrEZNQ0!eE-Ou<YxxCEHmWbybka%Oe=#sd$H
z-#r&>&T+7gQdxL_j1rdwpfa{In%+~xMh-i2#*x)3>}vNB-{=fyqY_>Tatvb%tyd`|
zTIwh*hj=-5dS&PGeSdM`^8F`H%`3sQo8U!3!l(fD5o|$RT~^kJZ$P4K`1Nbp%#Ldy
zlbpPR=_IR~>?ealRN^26=N?kxf)bZhZDsx9sj1WZ51!b$c>UPPSze9<24IlK8~1n<
zZV|qLHX79m6I0B$1j?JT?f8NkV`Ho3n|%(jIGjjz%r9>2UcA0@;m^<STs^ma-`4pn
zwZbOV=J_kowHptP9WQ(2c+bFHFtAiU!^;WafeIq&qhJ=>SxxWdqy)x7CfB{PR>Ssj
zeV1+N+t|81HGTH@$=PG$(?^e&kJvRnePq0RgsfD@r;i+;9z8nM(q3e_D;^lX@u`PS
zoLW>H4PMqD%QRRQi)x({Q}t{~Td&oyRR;nZt)*=UeHTl%V<wQX;1CkDw_pwx@oKPm
zbaVUa@w?~4u{O#E-w2q=Rz9m4eVkWA$LV?ITZN4bgqj&eCl$s;RPt%99mTnY^_WK3
zu!Fv{iB$DRh_S`t67YHkMz^-FojkP^Y;LK55w>LKM0tg=p|13N56vmq$P8zyOin8>
z!IVI{wJ<UZwq%E(Bp}hJL4s1Rq@WP7#IY4s1bMug5;RUuEZ=+eFZ1mqE|L0%Rg6cI
zT^3ss{^&Wd?XvTCFE%o=;E$*zB8j$xciq!kD9$XbV}M)PtWP4T@QOGZ^D-clpyDJA
zYoX`P3zr|5oLN=FdBSEXn(U@*{hSx~tB{`WbF$T*cbHd_n)Eeh{{GVsKla3v`wGRm
z#Z4{KEvYH5KP?9`UOz+vIiN%Ik!@xq)s(1aL|>W_CXN29*B_i++>!%Eg~}x+pjfJ>
zG`*HI2Ec}tf$i-2u7Z0DjvgGuxF=w|3(XBe6Xcd6NLeb|^T<En{NRHRZ+_|DS~`kn
zR(A)64`<s3a&3c5Su+^QwGAPrLNJtV#m;cPy%<k-dx0G=+Pe<|Y-)DR7s^sFf>e=>
zE!Du-)^<@y>=ZT+VzBY#L`LH9bzgY=%fEc*S3iCIzn}QxQ+mt5+|t(O_I=RS&Q+>w
zST{+GfW)Zts&=kj|J2`{K-ouHyZT4Z?OdN<KJRPHRe0<{h0X0vG2f6=a+J^;LiGq1
zn$dvy_F*{o+E0FVW_9Q9KK=P8|MeU2xxI6LSKq;&fkS<RqeMf{;k`9H)>62A`{MoJ
z*?;FfYnxZl0&vgHLu1V)5?O46l&#6Cw=_F^ZEO+d*sHJoY<_u5@+JP^Gmrk_?RTDi
z?uDnHdH$PEfBTtdzXKtD8tX^sOHY0+k?B6Ydg=NDe|z8c2Tz<@_BXZIz)U0thBcb(
znJBMn`heS;Mh_bK{+0C$N-$$%i{RdZ>&oXIe(Wbd{jbH-=VWADj2*n|6b{7myVrIu
zUEjTYKhAClF*bKE-LQn68%$q$>goUe)vt4{!yD(X{q;kiIW=`Q*xYJ?)l#{{Bos^a
zmZsN}27IGzEriWiWg|BP*`Ip&pB}$;>n#eF!9c)ahgI~YFsU%L&|(nUQ1GRg(1xO#
z#wu8vS=hMs#xKCOx_PBMyRL?rWA#+nAz(FZ@XBcEU){K<hIBgKW4OSmVdIfUpLqA(
z-(0%#faFL2nujt1w-l#rDK;DgCFPMd4+fW0ypn>Z=QrMX^KGz=9-a1uFvs?!s)AM7
zvO~l-p&4w%w?>^^TClEf-TUE(|A&OaB?xwbiVb$R2)3jW%zFJgv4}D-65E>Q6{4Ai
z%{SiqrO`4d_%d$E0mgY#RB6sz6?o$5{?g1wDmTpe48n%lyMEEe78@uYeetCq{NUwR
z4vm$NK8lCi0-*v7kbIO4FdpKY-84MHv9w2q;M?Y{H{VWY``i-p<zTBM(Gf_gXsUOj
zyryLbIXQ#UqP<XI!<CPycX0Ii7ryu1@BMJ(juVUrU^oh4mp|Ns%8`K=FhsbA$xqg*
zB)`EPXBW>Qr%AoHj?JvDDwvdVQ8703g2_g5%GgXWhSxVV_SLUH_ri<cFWx@R@Y=f$
z++A8M&#vAxxs1#IaiUo&7CTnF@Y&CO;jOpdi6uKN)9R2={}z?S);CdJ*Rn&LtP|f_
z1}K}skl2c@L=t-k$6osG%dfurdRx~4`1X$vKaOMTPk;L0{rBI0@4erBtbYIAd%yp~
zAO866uYViS3Y6`W!GIS__mLUG*hrratZZELg$y_D@JzV9lM6gi|1j`=_{xudoHBYp
z`}xP7dG6m^J8w_r`cm0mDg^cFPi0LdGQB9gYVNFAL3W&u(Z_TQy)eCz%nrjhbS3&|
zb>os6%34=ba>asa6(PAVzVz~czV`a_FZ{>NFMkas=fVp_8j}k>NR*&TqPm!@eS8EG
zON1)v!f{!vw98w=7OSvfR*<_NTj?c`JW>tcKK}ieUqLqi<>phUJzSV^hp7`A3+9Rg
z(d|uAr7;|s%!wgqQ0h+UZWtx&@yx*F%w{TA<bAjd5Z_o%Id2@J72nJ5RHkp#B5b1e
zzWViVJ@V*H3ib(XZYf2r!&)bc(*n-8y;a511ErbGWUk05S=2mXTfgLMBss0*u^O1^
zBS~!Qx&v38N-F8Mv$R(8SV`y}RE+cE*@$mjsoV%BWA@tF5^fv;Agl<FHgU2h`SClN
zW#)ve$E$M;Y)&wjly*rODg-2sr3XthTS>}>i9ze_vKq?M%e+}&wD6F)dexU1b{v&v
zKa2oVJ(Zj_<|dCi=|_m96{{Z048pf$wg}%WwtK;bE~q$0V)BTU;>irM9;}`UJGAm0
z8Ke~@XTU?PqmQ;StFXlxTW-Yd1zSAZTErbj4dGvStkGesF*+*%i9C{~bM~eQ=22h{
z&eja5u%bhWS9nx19!2MTraV3!B9Dr}9HT4Zs^a?a<m^@|zn_z{_|k0a$m#}s%OR(x
z9LG0~a(1SZL)@keub2{4o%dw~HOnhH1U$0J2n>(U6z&x~Vo>?ARTw4fk?~knTpt1(
za_W){q|9g;THQpw<=Bmg+zeGJ8j$NE{`%%n^;oB8x*-L!qMxoRPI&{Uq8~do%8C9O
z<wbv9P^qjyGm53@&4f`TIhEqZz9IbU#N6^Z{OxHkVc)Lvb4yMwZ_h99%q{Pbb!i)#
zB`e~O(eB(*y)MixU06JGd1d2jLa(wFdhet<ROqeIU4>q|Mhm?)I^5Ye*400Tm8kb{
zXa87%#MmbvQ5~@bh@qo}z9Tl_(IH>B;3oA}nP#*r9bNE=bBs(dHX_KZFnh3iLfHp?
zr4!k#uvQe+UIG}35T~c9PaI`tS6b7|99$kbV+t(^k&(sDN)}_SbY-<4t#+t(LA4{4
L9H->mO78ywQoE;H

literal 0
HcmV?d00001

diff --git a/EliteReporter/EliteReporter.csproj b/EliteReporter/EliteReporter.csproj
index 1b860b6..55afb9d 100644
--- 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
index ac30e54..b6b788c 100644
--- 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;