Build 1.0.4 Release Candidate 2

Units/Forms/UFRMWallet.pas

@@ -254,11 +254,7 @@ begin
   TNode.Node.Bank.DiskRestoreFromOperations(CT_MaxBlock);
   TNode.Node.AutoDiscoverNodes(CT_Discover_IPs);
   TNode.Node.NetServer.Active := true;
-<<<<<<< HEAD
   Synchronize( FRMWallet.UpdateAccounts );
-=======
-  Synchronize(FRMWallet.UpdateAccounts);
->>>>>>> origin/master
 end;
 
 { TFRMWallet }

Units/PascalCoin/UBlockChain.pas

@@ -1109,13 +1109,9 @@ destructor TPCOperationsComp.Destroy;
 begin
   Clear(true);
   FreeAndNil(FOperationsHashTree);
-<<<<<<< HEAD
   if Assigned(FSafeBoxTransaction) then begin
     FreeAndNil(FSafeBoxTransaction);
   end;
-=======
-  FreeAndNil(FSafeBoxTransaction);
->>>>>>> origin/master
   FreeAndNil(FStreamPoW);
   inherited;
 end;
@@ -1463,14 +1459,9 @@ end;
 procedure TPCOperationsComp.SetBank(const value: TPCBank);
 begin
   if FBank = value then exit;
-<<<<<<< HEAD
   if Assigned(FBank) then begin
      FreeAndNil(FSafeBoxTransaction);
   end;
-=======
-  if Assigned(FBank) then
-    FreeAndNil(FSafeBoxTransaction);
->>>>>>> origin/master
   FBank := value;
   if Assigned(value) then begin
     value.FreeNotification(Self);

Units/PascalCoin/ULog.pas

@@ -92,12 +92,8 @@ begin
 end;
 
 destructor TLog.Destroy;
-<<<<<<< HEAD
 var
   l : TList;
-=======
-var l : TList;
->>>>>>> origin/master
   i : Integer;
   P : PLogData;
 begin

Units/PascalCoin/UNetProtocol.pas

@@ -1267,10 +1267,6 @@ end;
 destructor TNetServer.Destroy;
 begin
   FreeAndNil(FTCPServer);
-<<<<<<< HEAD
-=======
-  FreeAndNil(FNetClients);
->>>>>>> origin/master
   inherited;
   FreeAndNil(FNetClients);
 end;
@@ -1286,7 +1282,6 @@ var i : Integer;
 begin
   inherited;
   if (Operation=opRemove) then begin
-<<<<<<< HEAD
     if Not Assigned(FNetClients) then exit;
     l := FNetClients.LockList;
     Try
@@ -1298,18 +1293,6 @@ begin
     Finally
       FNetClients.UnlockList;
     End;
-=======
-    if not Assigned(FNetClients) then // this happens occassionally
-    begin
-      TLog.NewLog(ltdebug,ClassName,'NetServer opRemove notification when NetClients=nil');
-      exit;
-    end;
-    i := FNetClients.IndexOf(AComponent);
-    if (i>=0) then begin
-      FNetClients.Delete(i);
-      TLog.NewLog(ltdebug,ClassName,'TNetConnection destroyed. Remaining: '+Inttostr(FNetclients.Count));
-    end;
->>>>>>> origin/master
   end;
 end;
 
@@ -1502,11 +1485,6 @@ begin
     TNetData.NetData.NotifyNetConnectionUpdated;
   Finally
     DeleteCriticalSection(FNetLock);
-<<<<<<< HEAD
-=======
-    if FClient.Owner=Self then
-      FreeAndNil(FClient);
->>>>>>> origin/master
     FreeAndNil(FClientBufferRead);
     inherited;
     FreeAndNil(FTcpIpClient);
@@ -2643,7 +2621,6 @@ end;
 
 destructor TNetClient.Destroy;
 begin
-<<<<<<< HEAD
   TLog.NewLog(ltdebug,Classname,'Starting TNetClient.Destroy');
   TNetData.NetData.FNetConnections.Remove(Self);
   FNetClientThread.OnTerminate := Nil;
@@ -2653,30 +2630,6 @@ begin
   end;
   FreeAndNil(FNetClientThread);
   inherited;
-=======
-  Try
-    debugStep := 'Remove';
-    TNetData.NetData.FNetConnections.Remove(Self);
-    debugStep := 'Assigning NIL on terminate thread';
-    FNetClientThread.OnTerminate := Nil;
-    debugStep := 'checking';
-    if Not FNetClientThread.Terminated then begin
-      debugStep := 'not terminated';
-      FNetClientThread.Terminate;
-      debugStep := 'Do wait for';
-      FNetClientThread.WaitFor;
-    end;
-    debugStep := 'Freeing';
-    FreeAndNil(FNetClientThread);
-    debugStep := 'Inherited';
-    inherited;
-  Except
-    On E:Exception do begin
-      E.Message := E.Message + ' STEP:'+debugStep;
-      Raise;
-    end;
-  End;
->>>>>>> origin/master
 end;
 
 procedure TNetClient.OnNetClientThreadTerminated(Sender: TObject);
@@ -2894,7 +2847,6 @@ end;
 
 procedure TNetClientDestroyThread.BCExecute;
 begin
-<<<<<<< HEAD
   DebugStep := 'Locking NetClient if exists';
   If TNetData.NetData.ConnectionLock(Self,FNetClient) then begin
     try
@@ -2905,13 +2857,6 @@ begin
       // -> TNetData.NetData.ConnectionUnlock(FNetClient);
     end;
   end;
-=======
-  DebugStep := 'Destroying NetClient if exists';
-  if TNetData.NetData.ConnectionExists(FNetClient) then begin
-    DebugStep := 'Destroying NetClient...';
-    FreeAndNil(FNetClient);
-  end else TLog.NewLog(ltdebug,classname,'Connection not exists!');
->>>>>>> origin/master
 end;
 
 constructor TNetClientDestroyThread.Create(NetClient: TNetClient);