From dcbfad7513e8eb5ad075a0c1829f984694171cd1 Mon Sep 17 00:00:00 2001 From: MikeMaximus Date: Sat, 8 Sep 2018 13:44:58 -0600 Subject: [PATCH] Add path display support to "Restore Path" field for #152 --- GBM/Forms/frmGameManager.vb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index 10d9112..47389ba 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -749,6 +749,7 @@ Public Class frmGameManager Dim oComboItems As New List(Of KeyValuePair(Of String, String)) Dim bLocalData As Boolean = False Dim bRemoteData As Boolean = False + Dim sttRestorePath As String 'cboRemoteBackup cboRemoteBackup.ValueMember = "Key" @@ -777,7 +778,18 @@ Public Class frmGameManager lblBackupFileData.Text = frmGameManager_ErrorNoBackupExists End If - lblRestorePathData.Text = CurrentBackupItem.RestorePath + If Not CurrentBackupItem.AbsolutePath And oApp.ProcessPath <> String.Empty Then + lblRestorePathData.Text = oApp.ProcessPath & Path.DirectorySeparatorChar & CurrentBackupItem.RestorePath + Else + If oSettings.ShowResolvedPaths Then + lblRestorePathData.Text = CurrentBackupItem.RestorePath + sttRestorePath = CurrentBackupItem.TruePath + Else + lblRestorePathData.Text = CurrentBackupItem.TruePath + sttRestorePath = CurrentBackupItem.RestorePath + End If + If CurrentBackupItem.AbsolutePath Then ttFullPath.SetToolTip(lblRestorePathData, sttRestorePath) + End If Else oComboItems.Add(New KeyValuePair(Of String, String)(String.Empty, frmGameManager_None)) lblBackupFileData.Text = String.Empty