From 5bdb89f917e1255fabcf3d7d45b5e866b4a016fc Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Mon, 22 Apr 2002 15:08:14 +0000
Subject: [PATCH] Patch level         : v32 nopatch Files correlati     : ba0 e
 ba1 Ricompilazione Demo : [ ] Commento            : Risolti alcuni conflitti
 d'interesse :-)

git-svn-id: svn://10.65.10.50/trunk@10177 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 ba/ba0.cpp    | 6 ++++--
 ba/ba1100.cpp | 4 ----
 ba/ba1500.cpp | 1 -
 ba/ba1600.cpp | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ba/ba0.cpp b/ba/ba0.cpp
index 68f02f422..5e77c0e1d 100755
--- a/ba/ba0.cpp
+++ b/ba/ba0.cpp
@@ -1452,7 +1452,9 @@ bool TMenu_application::check_user()
       break;
     
     utente = m.get(F_USER);
-    users.zero();
+		const TString& pass = m.get(F_PASSWORD);
+
+		users.zero();
     users.put("USERNAME", utente);
     
     pwd = "";
@@ -1477,7 +1479,7 @@ bool TMenu_application::check_user()
         pwd = "";
     }  
     
-    ok = utente.not_empty() && pwd.not_empty() && pwd == m.get(F_PASSWORD);
+		ok = utente.not_empty() && pwd.not_empty() && pwd == pass;
     
     if (ok) 
     {
diff --git a/ba/ba1100.cpp b/ba/ba1100.cpp
index 207ce162c..372c43fca 100755
--- a/ba/ba1100.cpp
+++ b/ba/ba1100.cpp
@@ -304,9 +304,7 @@ void TManutenzione_app::print()
 }
 
 bool TManutenzione_app::create() // initvar e arrmask
-
 {
-
   _firm = get_firm();
   TString sw(argc()>2 ? argv(2) : "");
   
@@ -361,8 +359,6 @@ bool TManutenzione_app::create() // initvar e arrmask
       butt.set_exit_key(K_F5); 
       _mask->enable(-1);         // Abilita campi privilegiati
     }
-
-    dispatch_e_menu(MENU_ITEM(1));
   }
   enable_menu_item(M_FILE_PRINT);
   return TSkeleton_application::create();
diff --git a/ba/ba1500.cpp b/ba/ba1500.cpp
index b1ea882a7..edbb33676 100755
--- a/ba/ba1500.cpp
+++ b/ba/ba1500.cpp
@@ -264,7 +264,6 @@ protected:
   virtual bool destroy() ;                        
   virtual void main_loop();
   virtual bool use_files() const { return FALSE; }
-  virtual bool menu(MENU_TAG);
   virtual bool test_assistance_year() const;
   
   void garble(word k[4]) const;
diff --git a/ba/ba1600.cpp b/ba/ba1600.cpp
index 871fa413e..184b6a061 100755
--- a/ba/ba1600.cpp
+++ b/ba/ba1600.cpp
@@ -1809,7 +1809,7 @@ bool TCreadischi_mask::zip_module(const TString& main_module, bool agg, int patc
   TFilename filelist;
   filelist.temp("", main_module);
   struct _stat info;
-  unsigned long lasttime=0;
+  long lasttime=0;
   
   // blocco della prima Progind
   {