From 57cd46744bef0cb3bf1653f6d0671d5680141bf3 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 5 Sep 2017 16:08:55 +0200
Subject: [PATCH] messo try-catch in parte vb

---
 .../.vs/MTC_Adapter/v15/sqlite3/storage.ide   | Bin 2183168 -> 2187264 bytes
 .../CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb      |  16 ++++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/MTC_Adapter/.vs/MTC_Adapter/v15/sqlite3/storage.ide b/MTC_Adapter/.vs/MTC_Adapter/v15/sqlite3/storage.ide
index 9e02149e706ce9a67dcb539a8fa1bba88cec9daa..028b356572bf0adfa6a2c4522801cea7a6f7941a 100644
GIT binary patch
delta 751
zcmZoz(8}0wpp|igG;aw51Ctm8GcZonFlQ{;n6S#8iAiKLj{_e+6N6&2jQ@5Sf5xX9
zwlf+i{^xHKU}_U!ZWCZ>6JTu<VB03Z9?it~ygf#U9f&!Am=lP(fS4PId4QM~i1~n+
zABY8jSP+PXfLIuaMSxgzdyJ6S(q4Y%GYq24#ti%wd|&wTnD1{FSRl5CS(s}pgRnZ2
zO>kvyQhrWIQEIAZ-t;qz#iqzVlV!GLa!D;n%}YtmD+x}`P0TCFOb$yeD$dN$V|Y4!
z_HwcA?XpY7^w}66PktY^rJZq&7!ZpCvBY-9HIgnYTFWb!mrs1q(9o#E!f?K56$cxm
zrHP3Ay|w<gC$}-?Z4z2ns&wz}<t5(^mv7JCAZeo_S8?+F<n%9BJQ#rBi3S4$D!={Y
z6-gkL0%GayC$Gp@+~(%`&cMh}#{fii+j%y~zUE?OU|{8BoW3xDdD`|#yJc&bxEUB2
zKQXX1sW19lFuie^Sn>1+$vm>#SMHN-pT@iH{mLmY`(|yo4V81e#rS-By}rB#<GkrB
z^yO6<!=|6pmsexr5^evcFAu~D)4%B}a`OY-$HG;?z<-p#k++|#VyggC1{Z5ji(g|p
z*lLlxOS@fyF3wka|Kx?r+n&!4E``3;-0q#ooWaCB@c?UM8oGNV8I6G<gH_iP0U<j^
z7RSa^=IIwL6cyA^!-Ro>&s)OT6B=f6>I@7PjmgZ~5z{B|Gl?n?QoGDSQ2>}W;ou*T
h^%sc$FfeQtljmaGuAnF%$A>jYc(_Cv89?Cx0stJi{KWtO

delta 587
zcmZoT(8}1bpp|igG;a_C1CuBN6in1GXAIhyu*#l^L2)yW10O#VlSs3S|8^OF#-|(j
zfr^;;8yWbI0tp7jhuZ}V6f?NCS4c5&va&cf`Y}(x$ibwb7W$xiTI!c89v~yvYA`VH
zc}qBZLiuv)3=9^HzRcPY(<j&~iYlP1EzXW?o$wl>HyNn5O@OIQfVoY8rA>gfO@M8i
z0DCkOV`F=a5IYca05K;Ja{)0o5c2>rFA(zqF+UIs0I?tt3jwh(5Q_k@==K;Pv8BEI
zEQt)F%*G7-6?|X#@|e$T7g!*+hk5$_#bQ&88o0JH2)m>fq~@ih=9L7e<|gKq$THh9
zp$TOshou%3XXfWIoSQy-xmfph*`;FoY>a0ozYp8e&bUSlh{b_eVmsp+Nf#C^28QM3
z6CX4*H0rQ0oG)6%!NzE5A|lThVf@o`@3VydR_ns~DjzPXKjLuMp1(oTMn!JkmS<tG
zV0;G*3RHgk$t#jTECs~U+fQDRvAE3*3~pwIItD&IuJ7A<Hpsr_V(n@1Yh;|hFoAj6
z_DQ>CYnZqv9$;-`U~5ue^tWJo<1(@0=?{{5WVf%}C)+-4`W!Y{sqJ2&awfMJ=S;8H
um)Bqnp1wj~UX_u1`Z;}hHKzR{?cem}fmmVsH+@C!t&B|n`Ik8;3IG6z@V*}a

diff --git a/MTC_Adapter/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb b/MTC_Adapter/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb
index 51ced23..0420ce4 100644
--- a/MTC_Adapter/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb
+++ b/MTC_Adapter/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb
@@ -1673,13 +1673,17 @@ Namespace CNC
 
       If Is30Series Then
 
-        ' leggo tutto!!!
-        nReturn = Focas1.cnc_rdalmmsg2(nLibHandle(nPathIdx), -1, numAllarmi, allData)
+        Try
+          ' leggo tutto!!!
+          nReturn = Focas1.cnc_rdalmmsg2(nLibHandle(nPathIdx), -1, numAllarmi, allData)
 
-        If F_CheckRetError_Cnc(nReturn, "cnc_rdalmmsg2 GetCncAlarm CNC.FANUC.CMS_CncLib") Then
-          Throw New CmsNcException("ERR cnc_rdalmmsg2 GetCncAlarm CNC.FANUC.CMS_CncLib")
-          Return New Focas1.ODBALMMSG2
-        End If
+          If F_CheckRetError_Cnc(nReturn, "cnc_rdalmmsg2 GetCncAlarm CNC.FANUC.CMS_CncLib") Then
+            Throw New CmsNcException("ERR cnc_rdalmmsg2 GetCncAlarm CNC.FANUC.CMS_CncLib")
+            Return New Focas1.ODBALMMSG2
+          End If
+        Catch ex As Exception
+
+        End Try
 
       End If