From ef3e79e0bb6ba4a5e5d4dc1467281370e1d8b488 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@users.sourceforge.net>
Date: Sat, 23 Aug 2008 22:54:42 +0200
Subject: Fix some compiler warnings

---
 UMain.pas | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'UMain.pas')

diff --git a/UMain.pas b/UMain.pas
index fd11934..c1496af 100644
--- a/UMain.pas
+++ b/UMain.pas
@@ -1642,7 +1642,7 @@ procedure TFMain.ChangingDir(LeftPanel: boolean; NewPath: string; HiliString1: s
 var ListView: TGTKListView;
     Engine: TPanelEngine;
     s, ss: string;
-    i, Sel, Err: integer;
+    i, Sel: integer;
     b, bb: boolean;
     tt: TDateTime;
     DataList, DirList: TList;
@@ -2173,8 +2173,6 @@ var s: PChar;
     AFGColor, ABGColor: PGdkColor;
 {    Rect, VisibleRect: TGdkRectangle; }
 begin
-  AFGColor := nil;
-  ABGColor := nil;
   if Application.GTKVersion_2_0_5_Up then ColumnIdx := gtk_tree_view_column_get_sort_column_id(tree_column) else
   begin
     ColumnIdx := 0;
@@ -2496,7 +2494,6 @@ var i: integer;
     AWorkingThread: TWorkerThread;
     AFProgress: TFProgress;
     CurrentEngine, OppositeEngine: TPanelEngine;
-    s: string;
     p: PChar;
     BypassSelAll: boolean;
 begin
@@ -3369,10 +3366,6 @@ procedure TFMain.EditViewFile(LeftPanel: boolean; AListView: TGTKListView; View,
 var ANewDir: TFNewDir;
     Engine: TPanelEngine;
     AFile: string;
-    Stat: PDataItemSL;
-    Error, x: integer;
-//    AViewer: TViewerThread;
-    AViewer: TFViewer;
 begin
   try
   InternalLock;
@@ -3524,7 +3517,7 @@ begin
     end else begin
            if Engine is TVFSEngine then begin
              HandleRunFromArchive(Path, Engine, Command, FileTypeDesc, False);
-             b := True;
+//             b := True;
            end else
            if Application.MessageBox(Format(LANGThereIsNoApplicationAssociatedWithS, [StrToUTF8(ExtractFileName(Path))]), [mbYes, mbNo], mbQuestion, mbNone, mbNo) = mbYes
               then miFileTypesClick(Self);
@@ -4280,7 +4273,7 @@ procedure TFMain.FilePopupMenuItemClick(Sender: TObject);
 var Engine: TPanelEngine;
     DataItem: PDataItemSL;
     AListView: TGTKListView;
-    FileName, ShortFName, s, APath: string;
+    FileName, ShortFName, s: string;
     Error: integer;
     b: boolean;
 begin
@@ -5703,6 +5696,7 @@ var LeftPanel: boolean;
     DontShowAgain: boolean;
     dst_no: integer;
 begin
+  Result := False;
   DontShowAgain := False;
   DebugMsg([' *** NotebookMoveTabToAnotherNotebook(SourceTabNo = ', SourceTabNo, ', DestTabNo = ', DestTabNo, ')']);
   LeftPanel := Sender = LeftPanelNotebook;
@@ -6208,15 +6202,15 @@ begin
       
       Engine.Path := ExtractFilePath(APath);
       //  Extract the files
+      LocalEngine := TLocalTreeEngine.Create;
+      AFProgress := TFProgress.Create(Self);
+      AWorkingThread := TWorkerThread.Create;
       try
-        AWorkingThread := TWorkerThread.Create;
         DebugMsg(['TFMain.HandleRunFromArchive: Creating thread...']);
-        AFProgress := TFProgress.Create(Self);
         AFProgress.Label1.Caption := LANGCopySC;
         AFProgress.SetNumBars(True);
         AFProgress.ProgressBar.Value := 0;
         AWorkingThread.ProgressForm := AFProgress;
-        LocalEngine := TLocalTreeEngine.Create;
         LocalEngine.SetPath(tmp);
         AWorkingThread.ExtractFromVFSMode := True;
         AWorkingThread.DestEngine := LocalEngine;
@@ -6248,10 +6242,10 @@ begin
         AFProgress.Close;
         Result := {(not AWorkingThread.Cancelled) and} (not AWorkingThread.ErrorHappened);
       finally
-        AFProgress.Free;
         DebugMsg(['TFMain.HandleRunFromArchive: Freeing thread...']);
-        AWorkingThread.Free;
         LocalEngine.Free;
+        AFProgress.Free;
+        AWorkingThread.Free;
       end;
       
       DebugMsg(['(II) HandleRunFromArchive: Old path = ', APath]);
@@ -6279,6 +6273,7 @@ end;
 
 function TFMain.HandleSetPassword(Engine: TPanelEngine): boolean;
 begin
+  Result := False;
   if not (Engine is TVFSEngine) then Exit;
   try
     FSetPassword := TFSetPassword.Create(Self);
-- 
cgit v1.2.3