From abff18f504061d364b2027fa1df2ca4f1980bb19 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Wed, 20 Jan 2016 17:22:17 +0000 Subject: [PATCH] Kp --- NetMonitorUtils/NetworkSetter.cs | 9 ++++++++- bin/Release/NetMonitorClient.exe | Bin 35840 -> 35840 bytes bin/Release/NetMonitorConsole.exe | Bin 20992 -> 20992 bytes bin/Release/NetMonitorServer.exe | Bin 34816 -> 34816 bytes bin/Release/NetMonitorTray.exe | Bin 66560 -> 66560 bytes bin/Release/NetMonitorUtils.dll | Bin 17920 -> 17920 bytes bin/Release/NetOpenVPNGUI.exe | Bin 22528 -> 22528 bytes bin/Release/Utils.dll | Bin 15872 -> 15872 bytes 8 files changed, 8 insertions(+), 1 deletion(-) diff --git a/NetMonitorUtils/NetworkSetter.cs b/NetMonitorUtils/NetworkSetter.cs index cd1f386..eab91dd 100644 --- a/NetMonitorUtils/NetworkSetter.cs +++ b/NetMonitorUtils/NetworkSetter.cs @@ -186,7 +186,14 @@ namespace NetMonitorUtils Dictionary ret = new Dictionary(); foreach (string adapter in adapters) { - String data = this.serviceController.NetworkGetName(adapter); + String data = ""; + try { + data = this.serviceController.NetworkGetName(adapter); + } catch(NetMonitorUtils.Execptions.ServiceControlException e) { + data = "unknown"; + this.addLog("NetworkSetter.getNetwork", e.Message, LogLevel.Error); + } + if (data == "unknown") { ret.Add(adapter, "unknown"); diff --git a/bin/Release/NetMonitorClient.exe b/bin/Release/NetMonitorClient.exe index 788cbeaceab556bc478ad6dd9419a6c19bcb05c5..95bb8cf377645f90e8f89782cc9b620a7de8a02b 100644 GIT binary patch delta 68 zcmZpe!PGE=X+j6{%$DAb-4Ck;vKi;?YAl!b-TzVZ@2$k7s?9Yu4y+*A$@?261(NK~ YK687Z?>Kjl;kKinpFZCFqEUhi07ZczGynhq delta 68 zcmZpe!PGE=X+j6{!-+l{yB}5yEDq!Aj=r$az4OMMYg6MEo!DGc1%oxHzMQoyQJ Y<~YOK8i#d_(MexLm-}yi(I~+M09=$G?EnA( diff --git a/bin/Release/NetMonitorConsole.exe b/bin/Release/NetMonitorConsole.exe index 294ed67326d4c4724fb18ebe6f4f75bf3faf25da..10201c37b86e45ae6002420f86019d19260e4002 100644 GIT binary patch delta 88 zcmZoz!q~8caY6_4%$DAb-7mET(sge*G9TUVzwxxWDMw1kwaqO$f0%TDvSAEBzy!oH oj0_Aje1TY>fgvc^C0Mf|>*%#s6&8Xe)zIo2A59}b>$^DNc1x|4t Ydi7zOo7|KpNO(|=yRDD*fT%y%H}z@KCpviC-*;+6v(O6 X3yk2-^x7KNQfHEUb>HS4k319sB7YxC diff --git a/bin/Release/NetMonitorUtils.dll b/bin/Release/NetMonitorUtils.dll index b0907cd66f2980c30d9523cce7c87a8bd7ad8570..e27a2d560684a58c38f65bacf0402b1e6a1c388f 100644 GIT binary patch delta 1710 zcmb7_ZA@EL7{~wT+|qknpm1Ag3zX0+V-P5%P;iCvQd~D-n=g#Gj35agbh>C#QuKpj zav?(}ku7U(GM5EoW;EGL7B`E@qVi!n_lfDE#>{NNPnyhZ;xw9tFy?b#LWysQCpphO zzvp?*|D1cyb8{zW+2kxc^15(r`cUSLO5Qz^Ilaeq>q+1-P#XneLPqfvOacYO^TR+u zQ+P-lVzn%(O)<4BI6?txebhPf5O@$cRs%4Nb#KW&&SOq?M4Kt-Ri#)92i#H}1)ce6 z#fh;3KEVK+n5qZt1xta#bhY74zv;l3Bc)JcRdJn<9!rpnSY0JSNVbaxr8X1Au9Jq8 zj?&CrR3|gKphvw@N~_#*lE*IRr8ep8jD=~c z+iC3ABbuqQm|g}+S5Ss*^By->w8^5!zMk-VF2QFeG;We@zT;^{UEky8zh^hPWxFia zg-AIhT6GZdta3ikTmT}HLxQF;_n z*Q+l;-A2_%cZoIXy>xFq1TGruP4~yCZ?n;8GFw?B_u+}*;Q|%D7U(C3ffLz9gAu&_&O@+dl0j4cD&`_OY0yzz;O`-VOJ)o=_!%@KK*z1myUov|1vM6} z7!r!om=vdAJ5E^CPZY;>i}sRC7g)2I zxu2*TwH8ef_23bUZu1Bd7`I5ISTE)*I!yEs0xha3Gbb!yE52zl=?qa4vr(N6-~y#? z!v_{!BHE5?7JVt~!^3#C)tE=8R!_8O5^hpvKUOXJm1qY-ZRQFq!d~petu|zPD(`Xi zBpbkj=!C+m*jXAciu0_QLAuD=$#a?YvU2GQ)=%Rr7+|}luh{?_mcBDQPV}>s)XP>dJJmf&TweyG~V!OEwf;9+?1 zHrWcyldU#vgJGkFKaP*czt!*z8g>|8k>@$Ak{yRb2x9_nvIkHh{0J8-V_`PU7T6jq z=Rw}dlUkQ@kj1i}D?txu(0*vG&&q9{yyC?jzntQsmBjmhsKxft?a^#&$22Rf7V}Hp z3U^U+7iT|t{|VV||~*$J4LY9{Mdi o*CjD`iS_%?XNC1~Fr#>Ra76pI`)<~iSP^)lD=R0LStcU>33$LX!vFvP delta 1663 zcmb7_ZA@Eb6vzMP-nRF)U`KnQEdzwYHV{f_ht&=SYY``iAI4ZV2$*PsGmFM97!xyG zE`-Igh)8q0nN0Uhjge?{H$)OcG;tpxYK#$+xv*%aF2XX+{6HLd?u#8Jy2K}WPS5W- z=l-9!b9=|8Xl#mRCdHNPW7$_KgpHx>dxyPm4FN~M?Fk?$X2VM17*NRk>>yCCg@uSV zK(*x1#z`$*;bfzAaTnmkastTh1V~G_Kd2uNk{%k?&J?CqDd`dbzf{LTPk}H>fJ4gE z1Fk}OB<#WQx(W_Nd@jkP%r2(n*PJDf#QzaB$coMx(SV$(<<#Inrq1}u+-KNVt9b>A z?2`kPFJ17-JdFy^J;Erjz>#U-48<|h!#ax7=g90Z*qy9pHNV?jp5n4neXfxk;MvMJ z!yPzptkp=UqcNJ6&LDk$tslA80&0m(EfBS!D^FcN8>RXmJHaD+${qBu`2$W@_Ja*aV z+_HVIeV<3nD{FAOB%jlCxe`o;wcDnGv{k`XpT6HHC*V8oEqpNwgO`1y8RMVACkmKDgtS%Bm1U3Qaai9806$rfH@QEXP$V z^-XaB4`F7vMYBwu=xR1-0`r{uFrKsN64QRw?daPpzJ5(jxrAncbMT z={KfF@v}|qVn2HDZUXv5#ce@-hkCIfc@U;bnq_}cx=3+?{3-3>kxP`O?eZdZv%iF1 zIw*fdy)-C)YmRu(O~dl{>>rnZq5&F}mw04aUgex~@*hO>p}c`(bY0#l+{8^e1{pJy?+aDi&GA+)geV`A5$!YWAiiY(8LYE?9+DWv zD2mulpj5mDFO^c1PSGdyCxwK2g%+Vh8xNnR2XuFJm7+By>WTD2iDG9_Fg5-8&>J6j z%q6qAj@hR_(_d^kMFnBWQ{oQ`UT(U3@B0+t55i&Nq>Xp2oZr7m{_CG?0}l3e_9b#^ zV*d%G&$fSXHG8sM)qiZ0$-iiS2#lxJ48JNH4hSnl*>JH|z3*4;KzmB}rq)FPZMv`X I24!Q?Ux^Mhf&c&j diff --git a/bin/Release/NetOpenVPNGUI.exe b/bin/Release/NetOpenVPNGUI.exe index 2491c363a252df261580cb164feaea74259fb5bc..60a8ddfcd2f08f50e36c046b3d17f289051dfe5b 100644 GIT binary patch delta 68 zcmZqJz}T>XaY6_4jF#Sw-8(%6z8y&9)$^R_wRhXS<1_1)S8WdQdch2moow$XDKH`W Y5)+F^qsP`R`$Pr12ML=q{AO?h04$*$lK=n! delta 68 zcmZqJz}T>XaY6_4gNZ&HyLWmDJXCSo_u68G*XI1Vm96`{EH;ODy>HuZK7=VBYh-DZV m7*+%Uu?Yi1P_RpI+={brx-Qi@?sIcE+B|1c(B?fRE}Q`E{~@yg delta 86 zcmZpuX{edd!TeyN&&KXpJ%P(1ZVIQ)vpTPEI