--- oup/current/Main.pas	2007/02/22 00:37:39	112
+++ oup/current/Main.pas	2007/03/30 00:51:58	139
@@ -137,6 +137,9 @@ var
 
 implementation
 
+uses
+  LevelDB;
+
 {$R *.dfm}
 
 
@@ -169,6 +172,7 @@ var
   i: Integer;
   toolform: TForm_ToolTemplate;
 begin
+  Result := True;
   if MDITab.MDIChildCount > 0 then
   begin
     for i := 0 to MDITab.MDIChildCount - 1 do
@@ -179,7 +183,10 @@ begin
         if toolform.ConnectionID = ConManager.ConnectionByIndex[index].ConnectionID then
         begin
           if not toolform.Closeable then
-            ShowMessage('Can not close toolwindow: ' + toolform.Caption); 
+          begin
+            ShowMessage('Can not close toolwindow: ' + toolform.Caption);
+            Result := False;
+          end;
         end; 
       end;
     end;
@@ -234,8 +241,6 @@ end;
 
 
 procedure TForm_Main.FormCreate(Sender: TObject);
-var
-  RepMsg: TStatusMessages;
 begin
   Self.Caption := 'Oni Un/Packer ' + version;
   Self.FormResize(Self);
@@ -440,7 +445,6 @@ var
   position: TTBDockPosition;
   mode: TTBItemDisplayMode;
   i: Integer;
-  isEnabled: Boolean;
 begin
   toolbar := TTBToolbar(Sender);
   if toolbar.Floating then
@@ -546,29 +550,27 @@ end;
  {####################################}
 procedure TForm_Main.menu_createdbClick(Sender: TObject);
 begin
-  ShowMessage('Not yet usable');
-{
+//  ShowMessage('Not yet usable');
+
   opend.Filter     := 'Oni-Dat-Files|*.dat';
   saved.Filter     := 'OUP-Level-DB (*.oldb)|*.oldb';
   saved.DefaultExt := 'oldb';
   if opend.Execute then
     if saved.Execute then
       Form_LevelDB.CreateDatabase(opend.FileName, saved.FileName);
-}
 end;
 
 
 procedure TForm_Main.menu_createlvlClick(Sender: TObject);
 begin
-  ShowMessage('Not yet usable');
-{
+//  ShowMessage('Not yet usable');
+
   opend.Filter     := 'OUP-Level-DB (*.oldb)|*.oldb';
   saved.Filter     := 'Oni-Dat-Files|*.dat';
   saved.DefaultExt := 'dat';
   if opend.Execute then
     if saved.Execute then
       Form_LevelDB.CreateLevel(opend.FileName, saved.FileName);
-}
 end;
 
 
@@ -673,7 +675,6 @@ end;
 procedure TForm_Main.menu_conns_itemClick(Sender: TObject);
 var
   name: String;
-  i: Integer;
   index: Integer;
   RepMsg: TStatusMessages;
 begin
@@ -743,6 +744,8 @@ begin
   iconindex := -1;
   caption_end := IntToStr(tag) + '       ';
 
+  toolform := nil;
+
   if window_context = 'binedit' then
   begin
     toolform         := TForm_BinEdit.Create(Self);