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