Check-in [5cfb19ef2b]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Use TryStrToInt instead of raising an exception.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 5cfb19ef2b59d8fd39a7e78e199c2b0937f49288
User & Date: tinus 2014-10-10 15:42:34.429
Context
2014-10-10
15:44
Attempted to include the auto-updater thread, but that seems to lock up the entire thing. Will try to fix later. Leaf check-in: bf57bb5520 user: tinus tags: trunk
15:42
Use TryStrToInt instead of raising an exception. check-in: 5cfb19ef2b user: tinus tags: trunk
2014-10-09
19:38
Added auto-updater unit (and all necessary dependencies: HTTP client, NativeXML parser and helper, version info access). check-in: f4fdab492d user: MCO tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/ScreenSaverUtils.pas.
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
      'a': ScreenSaverMode := ssPassword;
    end;
    // Find out if a handle was passed
    if (Length(Param) > 2) and (Param[2] = ':') then
      Delete(Param, 1, 2)
    else if ParamCount > 1 then
      Param := ParamStr(2);
    try
      ParentSaverHandle := StrToInt(Param);
    except
      ParentSaverHandle := 0;
    end;
  end;
  if ScreenSaverMode = ssPassword then
    SetScreenSaverPassword; // Calls halt
end;

procedure SetScreenSaverPassword;
var







<
|
<

<







63
64
65
66
67
68
69

70

71

72
73
74
75
76
77
78
      'a': ScreenSaverMode := ssPassword;
    end;
    // Find out if a handle was passed
    if (Length(Param) > 2) and (Param[2] = ':') then
      Delete(Param, 1, 2)
    else if ParamCount > 1 then
      Param := ParamStr(2);

    if not TryStrToInt(Param, Integer(ParentSaverHandle)) then

      ParentSaverHandle := 0;

  end;
  if ScreenSaverMode = ssPassword then
    SetScreenSaverPassword; // Calls halt
end;

procedure SetScreenSaverPassword;
var