Fixed init failures and minor game manager change
This commit is contained in:
@@ -630,7 +630,7 @@ Public Class frmGameManager
|
|||||||
lblLocalBackupData.ForeColor = Color.Black
|
lblLocalBackupData.ForeColor = Color.Black
|
||||||
ElseIf Not bRemoteData And bLocalData Then
|
ElseIf Not bRemoteData And bLocalData Then
|
||||||
btnMarkAsRestored.Enabled = False
|
btnMarkAsRestored.Enabled = False
|
||||||
lblLocalBackupData.ForeColor = Color.Red
|
lblLocalBackupData.ForeColor = Color.Black
|
||||||
ElseIf oComboItems(0).Value <> lblLocalBackupData.Text Then
|
ElseIf oComboItems(0).Value <> lblLocalBackupData.Text Then
|
||||||
lblLocalBackupData.ForeColor = Color.Red
|
lblLocalBackupData.ForeColor = Color.Red
|
||||||
btnMarkAsRestored.Enabled = True
|
btnMarkAsRestored.Enabled = True
|
||||||
|
|||||||
+16
-15
@@ -813,6 +813,13 @@ Public Class frmMain
|
|||||||
|
|
||||||
Private Sub LoadAndVerify()
|
Private Sub LoadAndVerify()
|
||||||
|
|
||||||
|
'If the default utility is missing we cannot continue
|
||||||
|
If Not oBackup.CheckForUtilities(mgrPath.Default7zLocation) Then
|
||||||
|
mgrCommon.ShowMessage(frmMain_Error7zip, MsgBoxStyle.Critical)
|
||||||
|
bInitFail = True
|
||||||
|
Exit Sub
|
||||||
|
End If
|
||||||
|
|
||||||
'Local Database Check
|
'Local Database Check
|
||||||
VerifyDBVersion(mgrSQLite.Database.Local)
|
VerifyDBVersion(mgrSQLite.Database.Local)
|
||||||
LocalDatabaseCheck()
|
LocalDatabaseCheck()
|
||||||
@@ -825,8 +832,8 @@ Public Class frmMain
|
|||||||
If Not bFirstRun Then
|
If Not bFirstRun Then
|
||||||
'The application cannot continue if this fails
|
'The application cannot continue if this fails
|
||||||
If Not VerifyBackupLocation() Then
|
If Not VerifyBackupLocation() Then
|
||||||
bShutdown = True
|
bInitFail = True
|
||||||
Me.Close()
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
'Remote Database Check
|
'Remote Database Check
|
||||||
@@ -857,13 +864,6 @@ Public Class frmMain
|
|||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
|
|
||||||
'If the default utility is missing we cannot continue
|
|
||||||
If Not oBackup.CheckForUtilities(mgrPath.Default7zLocation) Then
|
|
||||||
mgrCommon.ShowMessage(frmMain_Error7zip, MsgBoxStyle.Critical)
|
|
||||||
bShutdown = True
|
|
||||||
Me.Close()
|
|
||||||
End If
|
|
||||||
|
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
'Functions that handle buttons, menus and other GUI features on this form
|
'Functions that handle buttons, menus and other GUI features on this form
|
||||||
@@ -1643,6 +1643,7 @@ Public Class frmMain
|
|||||||
SetForm()
|
SetForm()
|
||||||
VerifyGameDataPath()
|
VerifyGameDataPath()
|
||||||
LoadAndVerify()
|
LoadAndVerify()
|
||||||
|
If Not bInitFail Then
|
||||||
VerifyCustomPathVariables()
|
VerifyCustomPathVariables()
|
||||||
|
|
||||||
If oSettings.StartToTray And Not mgrCommon.IsUnix Then
|
If oSettings.StartToTray And Not mgrCommon.IsUnix Then
|
||||||
@@ -1659,11 +1660,6 @@ Public Class frmMain
|
|||||||
|
|
||||||
HandleScan()
|
HandleScan()
|
||||||
CheckForNewBackups()
|
CheckForNewBackups()
|
||||||
Catch ex As Exception
|
|
||||||
If mgrCommon.ShowMessage(frmMain_ErrorInitFailure, ex.Message, MsgBoxStyle.YesNo) = MsgBoxResult.No Then
|
|
||||||
bInitFail = True
|
|
||||||
End If
|
|
||||||
End Try
|
|
||||||
|
|
||||||
'Unix Handler
|
'Unix Handler
|
||||||
If mgrCommon.IsUnix Then
|
If mgrCommon.IsUnix Then
|
||||||
@@ -1671,7 +1667,12 @@ Public Class frmMain
|
|||||||
Else
|
Else
|
||||||
Me.gMonTray.Visible = True
|
Me.gMonTray.Visible = True
|
||||||
End If
|
End If
|
||||||
|
End If
|
||||||
|
Catch ex As Exception
|
||||||
|
If mgrCommon.ShowMessage(frmMain_ErrorInitFailure, ex.Message, MsgBoxStyle.YesNo) = MsgBoxResult.No Then
|
||||||
|
bInitFail = True
|
||||||
|
End If
|
||||||
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
|
Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
|
||||||
|
|||||||
Reference in New Issue
Block a user