Match panel items by real name when restoring selection, not display name

2 files changed, 8 insertions, 8 deletions

diff --git a/UCore.pas b/UCore.pas
index deccbb1..cb80927 100644
--- a/UCore.pas
+++ b/UCore.pas
@@ -1441,12 +1441,12 @@ begin
     for i := 0 to DataList.Count - 1 do
       with PDataItem(DataList[i])^ do
         if Selected and (not UpDir) then Inc(SelCount);
-  Item1 := string(PDataItem(ListView.Selected.Data)^.FDisplayName);
+  Item1 := string(PDataItem(ListView.Selected.Data)^.FName);
   if (PDataItem(ListView.Selected.Data)^.Selected and (SelCount > 0)) or (SelCount = 0) then begin
     if ListView.ConvertToSorted(ListView.Selected.Index) < ListView.Items.Count then
       for i := ListView.ConvertToSorted(ListView.Selected.Index) + 1 to DataList.Count - 1 do
         if not PDataItem(DataList[ListView.ConvertFromSorted(i)])^.Selected then begin
-          Item2 := string(PDataItem(DataList[ListView.ConvertFromSorted(i)])^.FDisplayName);
+          Item2 := string(PDataItem(DataList[ListView.ConvertFromSorted(i)])^.FName);
           Break;
         end;
     if (Item2 = '') and (ListView.ConvertToSorted(ListView.Selected.Index) > 0) then
@@ -1454,7 +1454,7 @@ begin
         if (not PDataItem(DataList[ListView.ConvertFromSorted(i)])^.Selected) and
            (not PDataItem(DataList[ListView.ConvertFromSorted(i)])^.UpDir) then
         begin
-          Item2 := string(PDataItem(DataList[ListView.ConvertFromSorted(i)])^.FDisplayName);
+          Item2 := string(PDataItem(DataList[ListView.ConvertFromSorted(i)])^.FName);
           Break;
         end;
   end;
diff --git a/UMain.pas b/UMain.pas
index 66e9d3d..2e1371a 100644
--- a/UMain.pas
+++ b/UMain.pas
@@ -1744,8 +1744,8 @@ var ListView: TGTKListView;
   begin
     Result := False;
     for i := 0 to DataList.Count - 1 do
-     if (CaseSensitive and (WideCompareStr(string(PDataItem(DataList[i])^.FDisplayName), AName) = 0)) or
-        ((not CaseSensitive) and (WideCompareText(string(PDataItem(DataList[i])^.FDisplayName), AName) = 0)) then
+     if (CaseSensitive and (WideCompareStr(string(PDataItem(DataList[i])^.FName), AName) = 0)) or
+        ((not CaseSensitive) and (WideCompareText(string(PDataItem(DataList[i])^.FName), AName) = 0)) then
      begin
        Sel := i;
        Result := True;
@@ -2388,7 +2388,7 @@ begin
 
     if NewDir = '' then Exit;
     if not MakeDirectory(ListView, Engine, LeftPanel, NewDir) then Exit;
-    ChangingDir(LeftPanel, Engine.Path, StrToUTF8(NewDir));
+    ChangingDir(LeftPanel, Engine.Path, NewDir);
     DoRefresh(not LeftPanel, True, True);
   except end;
   finally
@@ -6054,7 +6054,7 @@ begin
 
   Result := Engine.SavePath;
   if not SuppressRefresh then
-    ChangingDir(LeftPanel, Engine.SavePath, StrToUTF8(Engine.ParentEngine.LastHighlightItem), Engine.ParentEngine.LastHighlightItem, False, True);
+    ChangingDir(LeftPanel, Engine.SavePath, Engine.ParentEngine.LastHighlightItem, Engine.ParentEngine.LastHighlightItem, False, True);
 
   if not TVFSEngine(Engine).VFSClose then DebugMsg(['Error closing the engine...']);
   Engine.Free;
@@ -6180,7 +6180,7 @@ begin
                          Break;
                        end;
                    end;
-                 end else ChangingDir(LeftLastFocused, ExtractFilePath(FSearch.GoToFile), StrToUTF8(ExtractFileName(FSearch.GoToFile)));
+                 end else ChangingDir(LeftLastFocused, ExtractFilePath(FSearch.GoToFile), ExtractFileName(FSearch.GoToFile));
                end;
     end;
   finally