Skip to content

Commit

Permalink
waptconsole : small fixes
Browse files Browse the repository at this point in the history
* check if waptsetup-tis.exe exists

* missing prototype cbADGroupDropDown for community

* removed unused
  • Loading branch information
htouvet committed May 28, 2020
1 parent 3d7615d commit 35c4ca3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
3 changes: 0 additions & 3 deletions wapt-get/waptcommonwin.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2296,9 +2296,6 @@ begin
else
Proxy:='';

dnsdomain:=GetDNSDomain;
if dnsdomain<>'' then
Result := GetRepoURLFromDNS('wapt',dnsdomain,Proxy);
end;


Expand Down
15 changes: 11 additions & 4 deletions waptconsole/uwaptconsole.pas
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
{$modeswitch ADVANCEDRECORDS}
{$modeswitch typehelpers}


interface

uses
Expand Down Expand Up @@ -2328,6 +2327,7 @@ function TVisWaptGUI.DownloadFileFromRepo(RepoUrl,Filename:String):String;
try
with TVisLoading.Create(Self) do
try
Result := '';
ProgressTitle(rsDownloading);
Application.ProcessMessages;
try
Expand Down Expand Up @@ -6385,11 +6385,13 @@ procedure TVisWaptGUI.ActVeyonUpdate(Sender: TObject);
procedure TVisWaptGUI.ActWaptSetupUpgradeExecute(Sender: TObject);
var
WaptsetupPath: String;

begin
WaptsetupPath := DownloadFileFromRepo(GetMainWaptRepoURL,'waptsetup-tis.exe');
RunAsAdmin(0,WaptsetupPath,'');
Application.Terminate;
if (WaptsetupPath<> '') and FileExistsUTF8(WaptsetupPath) then
begin
RunAsAdmin(0,WaptsetupPath,'');
Application.Terminate;
end;
end;

function TVisWaptGUI.GetGridHostsPlugins: ISuperObject;
Expand Down Expand Up @@ -7317,6 +7319,11 @@ procedure TVisWaptGUI.ActTriggerPendingActionsUpdate(Sender: TObject);
;;
end;

procedure TVisWaptGUI.cbADGroupDropDown(Sender: TObject);
begin
;;
end;


{$endif}

Expand Down

0 comments on commit 35c4ca3

Please sign in to comment.