--- oup/current/Tools/BinEdit.pas	2007/06/15 22:12:39	218
+++ oup/current/Tools/BinEdit.pas	2007/06/20 22:24:04	231
@@ -6,8 +6,8 @@ uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, VirtualTrees, Grids, Wrapgrid, MPHexEditor,
   StdCtrls, Menus, ExtCtrls, Buttons,
-  Data, TypeDefs, ConnectionManager, Template,
-  _TemplateFileList, VTHeaderPopup;
+  Data, TypeDefs, ConnectionManager,
+  _TemplateFileList, VTHeaderPopup, ComCtrls;
 
 type
   TForm_BinEdit = class(TForm_TemplateFileList)
@@ -29,7 +29,6 @@ type
     value_viewer_context_copyashex: TMenuItem;
     procedure NewFile(fileinfo: TFileInfo);
 
-    procedure LoadDat(_fileid: Integer);
     function Save: Boolean;
     function GetValue(datatype: Word; offset: Integer): String;
     procedure SetNewValue(datatype: Word; offset: Integer; Value: String);
@@ -70,7 +69,7 @@ type
 implementation
 {$R *.dfm}
 uses ValueEdit, Main, Functions, DatStructureLoader, RawEdit, RawList, 
-  StrUtils, Clipbrd;
+  StrUtils, Clipbrd, _TemplateFile;
 
 
 type
@@ -120,28 +119,6 @@ end;
 
 
 procedure TForm_BinEdit.NewFile(fileinfo: TFileInfo);
-begin
-  LoadDat(fileinfo.ID);
-end;
-
-
-
-
-function AddVSTEntry(AVST: TCustomVirtualStringTree; ANode: PVirtualNode;
-  ARecord: TNodeData): PVirtualNode;
-var
-  Data: PNodeData;
-begin
-  Result := AVST.AddChild(ANode);
-  Data   := AVST.GetNodeData(Result);
-  AVST.ValidateNode(Result, False);
-  Data^ := ARecord;
-end;
-
-
-
-
-procedure TForm_BinEdit.LoadDat(_fileid: Integer);
 var
   mem:  TMemoryStream;
 begin
@@ -156,12 +133,12 @@ begin
       end;
     end;
   end;
-  if _fileid >= 0 then
+  if fileinfo.ID >= 0 then
   begin
-    fileid := _fileid;
+    fileid := fileinfo.ID;
     ConID := ConnectionID;
-    if ConManager.Connection[ConID].ExtractFileIDOfName(filelist.Items.Strings[filelist.ItemIndex]) <> fileid then
-      Self.SelectFileID(ConnectionID, fileid);
+//    if ConManager.Connection[ConID].ExtractFileIDOfName(filelist.Items.Strings[filelist.ItemIndex]) <> fileid then
+//      Self.SelectFileID(ConnectionID, fileid);
     Self.ClearStructViewer;
     mem := nil;
     ConManager.Connection[ConID].LoadDatFile(fileid, TStream(mem));
@@ -173,7 +150,7 @@ begin
   end
   else
   begin
-    fileid := _fileid;
+    fileid := -1;
     ConID := -1;
     Self.ClearStructViewer;
     ClearValues;
@@ -184,6 +161,22 @@ end;
 
 
 
+
+function AddVSTEntry(AVST: TCustomVirtualStringTree; ANode: PVirtualNode;
+  ARecord: TNodeData): PVirtualNode;
+var
+  Data: PNodeData;
+begin
+  Result := AVST.AddChild(ANode);
+  Data   := AVST.GetNodeData(Result);
+  AVST.ValidateNode(Result, False);
+  Data^ := ARecord;
+end;
+
+
+
+
+
 function TForm_BinEdit.GetValue(datatype: Word; offset: Integer): String;
 var
   Data: TByteData;