Skip to content

Commit f315fd6

Browse files
authored
Merge pull request #798 from climsoft/V427+++
ClimsoftV427Plus++
2 parents e7829ec + d12b3b6 commit f315fd6

4 files changed

Lines changed: 17 additions & 9 deletions

File tree

ClimsoftVer4/ClimsoftVer4/frmObsView.Designer.vb

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ClimsoftVer4/ClimsoftVer4/frmObsView.vb

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -920,12 +920,13 @@
920920
'MsgBox(ex.Message & " " & ex.HResult)
921921
If ex.HResult = -2147467259 Then
922922
MsgBox("Check Selections")
923+
Me.Cursor = Cursors.Default
924+
Return False
923925
Else
924-
MsgBox(ex.Message & "showRecords")
926+
'MsgBox(ex.Message & "showRecords")
927+
Me.Cursor = Cursors.Default
928+
Return True
925929
End If
926-
927-
Me.Cursor = Cursors.Default
928-
Return False
929930
End Try
930931
End Function
931932
Function BackupRecords(tbl As String, sql As String) As Boolean

ClimsoftVer4/ClimsoftVer4/frmQC.vb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ Public Class frmQC
8080
chkAllElements.Checked = False
8181

8282
Try
83+
84+
Me.Cursor = Cursors.WaitCursor
85+
8386
conns.ConnectionString = frmLogin.txtusrpwd.Text
8487
conns.Open()
8588

@@ -129,8 +132,9 @@ Public Class frmQC
129132
itms = New ListViewItem(elm)
130133
lstViewElements.Items.Add(itms)
131134
Next
132-
135+
Me.Cursor = Cursors.Default
133136
Catch ex As MySql.Data.MySqlClient.MySqlException
137+
Me.Cursor = Cursors.Default
134138
MsgBox(ex.Message)
135139
conns.Close()
136140
End Try

ClimsoftVer4/ClimsoftVer4/frmUploadToObsFinal.vb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,8 @@ Public Class frmUploadToObsFinal
253253
lstViewElements.Columns.Add("Element Details", 200, HorizontalAlignment.Left)
254254

255255
Try
256+
Me.Cursor = Cursors.WaitCursor
257+
256258
conns.ConnectionString = frmLogin.txtusrpwd.Text
257259
conns.Open()
258260

@@ -300,8 +302,9 @@ Public Class frmUploadToObsFinal
300302
itms = New ListViewItem(elm)
301303
lstViewElements.Items.Add(itms)
302304
Next
303-
305+
Me.Cursor = Cursors.Default
304306
Catch ex As MySql.Data.MySqlClient.MySqlException
307+
Me.Cursor = Cursors.Default
305308
MsgBox(ex.Message)
306309
conns.Close()
307310
End Try

0 commit comments

Comments
 (0)